Add ffmpeg PCM and non-JOC E-AC-3/TrueHD takeover
- Add the take_over_pcm preference, persistence and input registration. - Decode takeover sources with ffmpeg to 48 kHz float32 and feed the kernel PCM_LAYOUT stream for binaural output. - Keep JOC priority: bare E-AC-3/EC3 and MP4/Matroska/WebM are probed first, then non-JOC audio falls back to ffmpeg. - Cover AC3, DTS/DTS-HD, WavPack, APE, TTA, MPC, AU/SND/CAF and TrueHD/MLP; TrueHD in containers follows the same fallback. - Sync the kernel to 1.3.3 with the virtual_speaker module and fix the PCM gain path. - Update the preferences UI, HRTF hint and README.
This commit is contained in:
1 parent
5c0f9ea2ff
commit
b0751d82b6
21 files changed
+933
-25
No files matched your search
@@ -40,7 +40,8 @@ typedef struct joc_stream joc_stream;
|
||||
typedef enum joc_stream_input {
|
||||
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_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;
|
||||
|
||||
typedef enum joc_stream_output {
|
||||
@@ -68,6 +69,8 @@ typedef struct joc_stream_config {
|
||||
* .jochrtf field (hrtf_path) or a Rosella .personalized_headphone model. */
|
||||
const char* personalized_headphone_path; /* Rosella .personalized_headphone input */
|
||||
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;
|
||||
|
||||
typedef struct joc_stream_buffer {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#define JOC_VERSION_MAJOR 1
|
||||
#define JOC_VERSION_MINOR 3
|
||||
#define JOC_VERSION_PATCH 1
|
||||
#define JOC_VERSION_STRING "1.3.1"
|
||||
#define JOC_VERSION_PATCH 3
|
||||
#define JOC_VERSION_STRING "1.3.3"
|
||||
|
||||
#endif /* JOC_VERSION_H */
|
||||
Reference in new issue
Block a user