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 a warp-3 stream.
This commit is contained in:
1 parent
43b16687cc
commit
d35f6abe7a
16 files changed
+824
-40
No files matched your search
@@ -9,6 +9,7 @@
|
||||
#include "foundation/status.h"
|
||||
#include "oamd/oamd_parser.h"
|
||||
#include "speaker/speaker_layout_lookup.h"
|
||||
#include "speaker/speaker_trim.h"
|
||||
|
||||
namespace joc::speaker {
|
||||
|
||||
@@ -23,6 +24,10 @@ struct SpeakerStep {
|
||||
std::uint32_t last_ramp_duration = 0;
|
||||
std::uint32_t last_object_count = 0;
|
||||
bool last_had_payload = false;
|
||||
// OAMD speaker controls. A payload carrying the trim element replaces
|
||||
// them; a payload without it keeps the previous set.
|
||||
ejoc_speaker_controls controls{};
|
||||
bool controls_ready = false;
|
||||
// bed 声道是固定通道:OAMD 不给位置,方位由声明的 bed 布局给出。这里存
|
||||
// 对象槽 → Q15 方位;bed_override 为 false 的槽仍按 OAMD 坐标声像。
|
||||
std::uint16_t bed_positions[oamd::kObjects][oamd::kAxes] = {};
|
||||
|
||||
Reference in new issue
Block a user