Sync the kernel copy with the truncated JOC payload fix
The kernel copy follows JustOneCacophonyCXX abce846 (version 1.3.0). An ID14 payload that ends inside joc_data is now a frame status (7) instead of a stream error, so the renderer holds the previous matrices and playback continues; the file task counts those frames and the stream status struct gains an appended truncated_joc_frames field that joc_stream_status() accepts in both struct sizes. The nine kernel files are byte-identical to the upstream checkout again, and the component needs no code change because the fix lives inside the vendored kernel. README, THIRD_PARTY_NOTICES, the kernel project and the CI comment now pin the copy to abce846 (version 1.3.0). Built Release-Static|x64. The offline test tools build and pass, and render_harness decodes the reported M4A to the end: 8 channels, 13,441,536 samples (8751 frames), peak 0.742114365, byte-identical to the fixed core CLI output.
This commit is contained in:
1 parent
defe9538fe
commit
b0ce3a162f
14 files changed
+102
-33
No files matched your search
@@ -1594,6 +1594,7 @@ Status run(const joc_task_config& raw, const joc_event_sink* sink, joc_task_resu
|
||||
// count was clamped to 15, and frames whose syncframe carried a second EMDF
|
||||
// container that is not this frame's JOC metadata.
|
||||
std::uint64_t missing_joc_frames = 0;
|
||||
std::uint64_t truncated_joc_frames = 0;
|
||||
std::uint64_t objects_clamped_frames = 0;
|
||||
std::uint64_t bad_parameter_band_frames = 0;
|
||||
std::uint64_t bad_offset_ts_frames = 0;
|
||||
@@ -1678,6 +1679,9 @@ Status run(const joc_task_config& raw, const joc_event_sink* sink, joc_task_resu
|
||||
case JOC_FRAME_STATUS_TRAILING_DATA:
|
||||
++trailing_data_frames;
|
||||
break;
|
||||
case JOC_FRAME_STATUS_TRUNCATED:
|
||||
++truncated_joc_frames;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -2219,6 +2223,11 @@ Status run(const joc_task_config& raw, const joc_event_sink* sink, joc_task_resu
|
||||
" audio frame(s) carried JOC data after the byte-alignment padding; "
|
||||
"the frame took the invalid-frame path");
|
||||
}
|
||||
if (truncated_joc_frames != 0u) {
|
||||
bus.warning(std::to_string(truncated_joc_frames) +
|
||||
" audio frame(s) carried a JOC payload that ends inside joc_data; "
|
||||
"the frame took the invalid-frame path and held the previous matrices");
|
||||
}
|
||||
if (extra_container_frames != 0u) {
|
||||
bus.warning(std::to_string(extra_container_frames) +
|
||||
" audio frame(s) carried a second EMDF container; the container whose OAMD "
|
||||
|
||||
Reference in new issue
Block a user