From abbc65b6be18a70ccc5bf78ca8f9b2c0c64e0a7a Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 21 Mar 2025 17:17:01 +0100 Subject: [PATCH 1/2] issue 1301: support External HRTF loading in OSBA bitrate switching; under FIX_1301_EXTERNAL_HRTF_OSBA --- lib_com/options.h | 1 + lib_dec/lib_dec.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 84ce770c97..62e5c7257d 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,6 +163,7 @@ #define FIX_1285_RENDER_CONFIG_PTR_COMPARE /* Philips: Warning about pointer comparison in the render config reader */ #define FIX_1298_MEMORY_OPT_IVAS_CORE_ENC /* VA: issue 1298: Memory saving in ivas_core_enc() */ #define SIMPLIFY_IVAS_CORE /* VA: simplify ivas core coder functions */ +#define FIX_1301_EXTERNAL_HRTF_OSBA /* VA: issue 1301: support External HRTF loading in OSBA bitrate switching */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 7640228d3b..65e7c7f7d1 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -986,6 +986,12 @@ ivas_error IVAS_DEC_ReadFormat( { *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND; } +#ifdef FIX_1301_EXTERNAL_HRTF_OSBA + else if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && output_config == IVAS_AUDIO_CONFIG_BINAURAL ) + { + *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND; + } +#endif *hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID; if ( *binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV ) -- GitLab From bd52709fdbb03b69130634fc2413379d81b9a603 Mon Sep 17 00:00:00 2001 From: vaclav Date: Sat, 22 Mar 2025 11:17:53 +0100 Subject: [PATCH 2/2] cover also BINAURAL_ROOM_REVERB outputs --- lib_dec/lib_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 65e7c7f7d1..45c2fc8bef 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -987,7 +987,7 @@ ivas_error IVAS_DEC_ReadFormat( *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND; } #ifdef FIX_1301_EXTERNAL_HRTF_OSBA - else if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && output_config == IVAS_AUDIO_CONFIG_BINAURAL ) + else if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) { *binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_TDREND; } -- GitLab