Sync the kernel copy with the OAMD warp and trim controls
The kernel copy follows the new kernel: the OAMD parser reads the trim element, the speaker renderer applies warp, per-object trim and the front-back balance, and the ADM writer carries them into the BWF metadata. joc_kernel.vcxproj lists the new speaker_trim translation unit and header, and the copied joc_version.h reports kernel 1.2.0 in the session log. The component keeps its playback settings, its speaker layout table and the side/rear channel swap; the stream interface is unchanged, so the decoder wrapper needs no edit. A stream whose OAMD asks for warp 2/3 now stops at the speaker renderer with JOC_ERR_NOT_SUPPORTED, as the reference refuses it. Builds Release-Static|x64 and |Win32. layout_table_test and channel_swap_test still pass; the render harness renders a warp-1 stream and reports the unimplemented mode for the warp-3 golden stream.
This commit is contained in:
1 parent
43b16687cc
commit
9c1bd7ba29
16 files changed
+824
-40
No files matched your search
@@ -26,8 +26,29 @@ Status step(SpeakerStep* context, const std::vector<float>& objects16_planar,
|
||||
static_cast<std::size_t>(JOC_FRAME_SAMPLES) * context->layout.channel_count, 0.0);
|
||||
|
||||
context->last_had_payload = update != nullptr;
|
||||
if (!context->controls_ready) {
|
||||
const Status status =
|
||||
parameters_from_oamd(nullptr, context->layout, &context->controls);
|
||||
if (!status.ok()) {
|
||||
if (error != nullptr) {
|
||||
*error = status.message();
|
||||
}
|
||||
return status;
|
||||
}
|
||||
context->controls_ready = true;
|
||||
}
|
||||
std::uint32_t ramp = 0;
|
||||
if (update != nullptr) {
|
||||
if (update->has_trim) {
|
||||
const Status status = parameters_from_oamd(&update->trim, context->layout,
|
||||
&context->controls);
|
||||
if (!status.ok()) {
|
||||
if (error != nullptr) {
|
||||
*error = status.message();
|
||||
}
|
||||
return status;
|
||||
}
|
||||
}
|
||||
context->state.apply(*update);
|
||||
ramp = update->ramp_duration_samples;
|
||||
context->last_block_offset = update->block_offset_samples;
|
||||
@@ -53,7 +74,7 @@ Status step(SpeakerStep* context, const std::vector<float>& objects16_planar,
|
||||
context->handle, context->interleaved.data(), JOC_FRAME_SAMPLES, event_count,
|
||||
event_count != 0u ? &offset : nullptr, event_count != 0u ? &ramp : nullptr,
|
||||
event_count != 0u ? &positions[0][0] : nullptr, nullptr, nullptr, nullptr,
|
||||
context->output.data());
|
||||
&context->controls, context->output.data());
|
||||
if (result != 0) {
|
||||
const char* message = ejoc_speaker_renderer_last_error(context->handle);
|
||||
const std::string text =
|
||||
|
||||
Reference in new issue
Block a user