Bump to 1.3.3 and add PCM layout streaming input
- Add JOC_STREAM_IN_PCM_LAYOUT for interleaved 48 kHz float32 PCM with 2.0/5.1/7.1 auto layout detection. - Isolate PCM channel mapping and fixed object positions in the new virtual_speaker module; the stream only schedules it. - Apply the master gain once inside virtual_speaker for the PCM path, while the E-AC-3/JOC path keeps its existing rebuild gain. - Add the multichannel binaural CLI, rational resampler and float32 WAV I/O. - Extend tests for the multichannel/resampling paths.
This commit is contained in:
1 parent
787984afe5
commit
6edcabf777
16 files changed
+1170
-9
No files matched your search
@@ -46,6 +46,7 @@ joc::stream::Config to_config(const joc_stream_config& config) {
|
||||
if (config.rosella_filterbank != 0u) {
|
||||
out.rosella_filterbank = config.rosella_filterbank;
|
||||
}
|
||||
if (config.pcm_layout != nullptr) { out.pcm_layout = config.pcm_layout; }
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -95,6 +96,19 @@ joc_error JOC_CALL joc_stream_push(joc_stream* stream, const joc_stream_buffer*
|
||||
}
|
||||
return pushed;
|
||||
}
|
||||
if (input->kind == JOC_STREAM_IN_PCM_LAYOUT) {
|
||||
if (input->sample_rate != 0u && input->sample_rate != 48000u) {
|
||||
return joc::Status::fail(JOC_ERR_INVALID_ARGUMENT, joc::stage::kRender,
|
||||
"PCM layout input must be 48 kHz");
|
||||
}
|
||||
std::size_t consumed = 0;
|
||||
const joc::Status pushed = stream->instance.push_pcm_layout(
|
||||
input->pcm, input->sample_count, input->channels, &consumed);
|
||||
if (consumed_samples != nullptr) {
|
||||
*consumed_samples = static_cast<std::uint32_t>(consumed);
|
||||
}
|
||||
return pushed;
|
||||
}
|
||||
std::size_t consumed = 0;
|
||||
const std::uint32_t channels = input->channels != 0u ? input->channels : 6u;
|
||||
const joc::Status pushed =
|
||||
|
||||
Reference in new issue
Block a user