Write OAMD object render metadata into the ADM BWF
ci / ubuntu-latest (push) Failing after 14s
ci / macos-latest (push) Canceled after 0s
ci / windows-latest (push) Canceled after 0s
ci / release (push) Canceled after 0s

Port the Python reference ADM metadata change.  The ADM export path now parses
the full OAMD frame state, so the same block-0 render state the speaker
renderer consumes is available to the trajectory builder.

adm::ObjectMetadata (gain, width/depth/height size, divergence, snap) is
attached to Keyframe and OamdEvent.  TrajectoryBuilder updates the per-object
state from frame_state, emits an event when position or metadata changes, and
both compact and dense64 expansion modes carry the snapshot into every ADM
block.  The state is held across frames without a payload; inactive objects
write gain 0.  Divergence is taken from the current payload (0 when the
extended element does not carry it), matching the speaker renderer instead of
holding a stale value.

build_axml writes width/height/depth (relative 0..1), gain in linear units and
objectDivergence positionRange, omitting defaults.  The ADM path requests
parse_id11_state() so frame_state is populated.  test_core adds coverage for
the AXML fields and for the trajectory metadata and divergence reset.

Bump JOC_VERSION to 1.3.2.
This commit is contained in:
TheM14 committed 2026-11-12 02:01:13 +08:00
1 parent 836d68c354
commit 787984afe5
7 files changed
+151 -19

No files matched your search

+56
View File
@@ -12,6 +12,7 @@
#include <vector>
#include "adm/adm_metadata.h"
#include "adm/adm_tracks.h"
#include "eac3_transport/eac3_reader.h"
#include "eac3joc_core.h"
#include "foundation/bit_reader.h"
@@ -955,6 +956,60 @@ void test_dbmd_and_axml_trim() {
CHECK(plain_axml.find("<DolbyAtmosMasterFile>") == std::string::npos);
}
void test_adm_object_metadata() {
std::vector<joc::adm::Track> tracks(15);
for (std::size_t i = 0; i < tracks.size(); ++i) {
tracks[i].name = "obj" + std::to_string(i);
}
joc::adm::Keyframe block;
block.duration_samples = 48000;
block.meta.gain = 0.5;
block.meta.size[0] = 0.516155;
block.meta.size[1] = 0.516155;
block.meta.size[2] = 0.516155;
block.meta.divergence = 0.25;
tracks[1].blocks.push_back(block);
const std::string axml = joc::adm::build_axml(tracks, 1.0, 48000);
CHECK(axml.find("<width>0.516155</width><height>0.516155</height><depth>0.516155</depth>") !=
std::string::npos);
CHECK(axml.find("<gain gainUnit=\"linear\">0.500000</gain>") != std::string::npos);
CHECK(axml.find("<objectDivergence positionRange=\"0.250000\"/>") != std::string::npos);
// Default metadata writes no fields.
tracks[1].blocks[0].meta = joc::adm::ObjectMetadata{};
const std::string plain = joc::adm::build_axml(tracks, 1.0, 48000);
CHECK(plain.find("<width>") == std::string::npos);
CHECK(plain.find("<gain ") == std::string::npos);
CHECK(plain.find("<objectDivergence ") == std::string::npos);
// TrajectoryBuilder carries block-0 metadata and drops divergence when the
// next payload does not send it, matching the speaker renderer.
joc::adm::TrajectoryBuilder builder;
joc::oamd::OamdUpdate update;
update.has_frame_state = true;
update.object_count = 3;
update.frame_state.object_count = 3;
update.frame_state.block_count = 1;
update.frame_state.objects.resize(3);
auto& element = update.frame_state.objects[2];
element.kind = joc::oamd::ObjectKind::kDynamic;
element.blocks.resize(1);
auto& render = element.blocks[0].render;
render.gain_q = 2048;
render.size_mode = 1;
render.size_q[0] = render.size_q[1] = render.size_q[2] = 16384;
render.divergence_q = 16384;
builder.submit_frame(0, &update, 0);
joc::oamd::OamdUpdate second = update;
second.frame_state.objects[2].blocks[0].render.divergence_q = 0;
builder.submit_frame(40, &second, 0);
std::vector<joc::adm::Track> trajectory;
CHECK(builder.build(96000, joc::adm::TrajectoryMode::Compact, &trajectory).ok());
CHECK(trajectory[1].blocks.size() >= 2);
CHECK(std::fabs(trajectory[1].blocks.front().meta.gain - 0.5) < 1e-12);
CHECK(trajectory[1].blocks.back().meta.divergence == 0.0);
}
void test_int24_packing() {
// Interleaved (L,R) for two frames: 0.0, +1.0, -1.0, +2.0 (clips).
const float values[4] = {0.0f, 1.0f, -1.0f, 2.0f};
@@ -2421,6 +2476,7 @@ int main() {
test_speaker_surround_fold();
test_speaker_step_trim_events();
test_dbmd_and_axml_trim();
test_adm_object_metadata();
test_int24_packing();
test_utf8_paths();
test_process_runner();