Sync the native ad_joc stream header to the 1.3.3 kernel

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.
This commit is contained in:
TheM14 committed 2026-11-13 13:50:54 +08:00
1 parent 86774828d4
commit 87b850fd2f
1 file changed
+4 -1
+4 -1
View File
@@ -40,7 +40,8 @@ typedef struct joc_stream joc_stream;
typedef enum joc_stream_input { typedef enum joc_stream_input {
JOC_STREAM_IN_EAC3 = 0, /* bare E-AC-3 syncframes (the metadata stream) */ JOC_STREAM_IN_EAC3 = 0, /* bare E-AC-3 syncframes (the metadata stream) */
JOC_STREAM_IN_PCM_OBJECTS16 = 1, /* objects16 frames, planar [16][1536] each */ JOC_STREAM_IN_PCM_OBJECTS16 = 1, /* objects16 frames, planar [16][1536] each */
JOC_STREAM_IN_CORE_PCM = 3 /* the 5.1 core PCM of the pushed E-AC-3 frames */ JOC_STREAM_IN_CORE_PCM = 3, /* the 5.1 core PCM of the pushed E-AC-3 frames */
JOC_STREAM_IN_PCM_LAYOUT = 4 /* interleaved 48k f32, mapped by pcm_layout */
} joc_stream_input; } joc_stream_input;
typedef enum joc_stream_output { typedef enum joc_stream_output {
@@ -68,6 +69,8 @@ typedef struct joc_stream_config {
* .jochrtf field (hrtf_path) or a Rosella .personalized_headphone model. */ * .jochrtf field (hrtf_path) or a Rosella .personalized_headphone model. */
const char* personalized_headphone_path; /* Rosella .personalized_headphone input */ const char* personalized_headphone_path; /* Rosella .personalized_headphone input */
uint32_t jochrtf_room; /* non-zero enables the project room */ uint32_t jochrtf_room; /* non-zero enables the project room */
/* PCM_LAYOUT input: "2.0", "5.1", "7.1", or NULL/"" to infer by channels. */
const char* pcm_layout;
} joc_stream_config; } joc_stream_config;
typedef struct joc_stream_buffer { typedef struct joc_stream_buffer {