Add JOC downmix configurations 0..4, cross-layer notes, and the analysis-side clipgain
This commit is contained in:
1 parent
338a4f4d36
commit
6f6b5db6c2
32 files changed
+1973
-276
No files matched your search
+3
-11
@@ -11,16 +11,8 @@
|
||||
|
||||
namespace {
|
||||
|
||||
thread_local std::string g_detail;
|
||||
|
||||
joc_error finish(const joc::Status& status) {
|
||||
if (status.ok()) {
|
||||
g_detail.clear();
|
||||
return JOC_OK;
|
||||
}
|
||||
g_detail.assign(status.stage());
|
||||
g_detail.append(": ");
|
||||
g_detail.append(status.message());
|
||||
joc::record_error_detail(status);
|
||||
return status.code();
|
||||
}
|
||||
|
||||
@@ -49,7 +41,7 @@ extern "C" {
|
||||
|
||||
std::uint32_t JOC_CALL joc_abi_version(void) { return JOC_ABI_VERSION; }
|
||||
|
||||
const char* JOC_CALL joc_version_string(void) { return "0.1.0-m1"; }
|
||||
const char* JOC_CALL joc_version_string(void) { return JOC_VERSION_STRING; }
|
||||
|
||||
std::uint32_t JOC_CALL joc_event_size(void) { return static_cast<std::uint32_t>(sizeof(joc_event)); }
|
||||
std::uint32_t JOC_CALL joc_task_config_size(void) {
|
||||
@@ -167,7 +159,7 @@ const char* JOC_CALL joc_error_stage(joc_error code) {
|
||||
}
|
||||
}
|
||||
|
||||
const char* JOC_CALL joc_last_error_detail(void) { return g_detail.c_str(); }
|
||||
const char* JOC_CALL joc_last_error_detail(void) { return joc::last_error_detail.c_str(); }
|
||||
|
||||
joc_error JOC_CALL joc_parse_id14(const std::uint8_t* payload, std::size_t payload_size,
|
||||
joc_frame_params* out_params) {
|
||||
|
||||
@@ -13,6 +13,9 @@ struct joc_stream {
|
||||
namespace {
|
||||
|
||||
joc_error finish_stream(const joc::Status& status) {
|
||||
// The structured detail is not dropped here: joc_last_error_detail() reports
|
||||
// it for the streaming entry points as well as for the task API.
|
||||
joc::record_error_detail(status);
|
||||
return status.code();
|
||||
}
|
||||
|
||||
@@ -93,12 +96,14 @@ joc_error JOC_CALL joc_stream_push(joc_stream* stream, const joc_stream_buffer*
|
||||
return pushed;
|
||||
}
|
||||
std::size_t consumed = 0;
|
||||
const std::uint32_t channels = input->channels != 0u ? input->channels : 6u;
|
||||
const joc::Status pushed =
|
||||
stream->instance.push_bed(input->pcm, input->sample_count, &consumed);
|
||||
stream->instance.push_bed(input->pcm, input->sample_count, channels, &consumed);
|
||||
if (consumed_samples != nullptr) {
|
||||
*consumed_samples = static_cast<std::uint32_t>(consumed);
|
||||
}
|
||||
return pushed; }();
|
||||
return pushed;
|
||||
}();
|
||||
return finish_stream(status);
|
||||
}
|
||||
|
||||
@@ -149,6 +154,11 @@ joc_error JOC_CALL joc_stream_status(const joc_stream* stream, joc_stream_status
|
||||
out->buffered_samples = stream->instance.buffered_samples();
|
||||
out->oamd_payloads = info.oamd_payloads;
|
||||
out->oamd_transitions = info.oamd_transitions;
|
||||
out->missing_joc_frames = info.missing_joc_frames;
|
||||
out->objects_clamped_frames = info.objects_clamped_frames;
|
||||
out->extra_container_frames = info.extra_container_frames;
|
||||
out->chanmap_pair_mismatch_frames = info.chanmap_pair_mismatch_frames;
|
||||
out->bed_mask_mismatch_frames = info.bed_mask_mismatch_frames;
|
||||
out->output_channels = info.output_channels;
|
||||
out->ended = info.ended;
|
||||
return JOC_OK;
|
||||
|
||||
Reference in new issue
Block a user