The native decoder is compiled against fork/files/audio/decode/joc_stream.h,
but the workflow builds joc_core from the current JustOneCacophony main
branch. Version 1.3.3 appended pcm_layout to joc_stream_config; the stale
1.3.1 header made struct_size disagree with the core, so joc_stream_create()
failed and every E-AC-3 JOC file stopped initializing.
Sync the header with include/joc_stream.h, including
JOC_STREAM_IN_PCM_LAYOUT and the pcm_layout field, so the native decoder
matches the 1.3.3 core ABI.
This only restores the existing JOC path; ad-joc-pcm is not implemented yet.
Both copies of the three public headers follow the main repository:
third_party/joc/include for the cplugin and fork/files/audio/decode for the
ad_joc patch now carry joc_core.h, joc_stream.h and joc_version.h from
JustOneCacophonyCXX abce846 (version 1.3.0). The fix behind them turns an
ID14 payload that ends inside joc_data into a frame status (7) instead of a
stream error, so the renderer holds the previous matrices and playback
continues; joc_stream_status_info gains an appended truncated_joc_frames
field while JOC_ABI_VERSION stays at 6, so neither integration needs a code
change.
tools/verify_kernel.ps1 reports all three headers byte-identical to the
checkout. tools/build.ps1 -JocCoreSource compiles joc_mpv.dll against the
synced headers and builds joc_core.dll from the fixed source; with that core
next to the portable mpv build, --ad=joc plays the reported M4A to the end
instead of stopping at 2:12.672.
The kernel renders the Rosella .personalized_headphone model or an already
compiled .jochrtf field, and only the first is a user-facing input: the SOFA
reader and its compile cache left the library. joc-hrtf-source, joc-hrtf-cache
and joc-hrtf-cache-dir go with them, and the default file is now
binaural.personalized_headphone only.
The plugin sets personalized_headphone_path directly, and the disk-cache retry
path disappears with the cache itself. The headers in third_party/joc/include
and fork/files/audio/decode follow the new kernel, so the config structs no
longer carry hrtf_sofa_path, hrtf_cache_policy, hrtf_cache_dir or hrtf_radius_m,
and the rosella filterbank no longer needs its SOFA exception.
The example config and the option tables in both READMEs drop the removed keys.
Builds against the kernel with tools/build.ps1 -JocCoreSource.
The kernel replaced the reserved words with rosella_filterbank and
bumped the task config version to 4; joc_task_config and
joc_stream_config keep their sizes, so the ABI stays compatible.
- Update third_party/joc/include/joc_core.h and joc_stream.h
- Update the copies ad_joc compiles against in
fork/files/audio/decode/
tools/verify_kernel.ps1 reports the public headers byte-identical to
the upstream checkout.