From 84e6ab1945eb0ce845f9e1e152325917aeac254b Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 15 Jan 2024 09:09:42 +0100 Subject: [PATCH 1/2] issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering; under FIX_959_MASA_LINEAR_REND --- lib_com/options.h | 1 + lib_dec/ivas_jbm_dec.c | 5 ++++- lib_dec/ivas_output_config.c | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index fc6c6a06aa..7f76aa2a94 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -155,6 +155,7 @@ #define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange: Missing left/right and coherence late reverb tables in binary format*/ #define FIX_OLD_BINARY_FORMAT /* Orange: temporary to maintain bitexactness */ #define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */ +#define FIX_959_MASA_LINEAR_REND /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 69288104ec..74bac4833f 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1119,6 +1119,7 @@ ivas_error ivas_jbm_dec_render( } else if ( st_ivas->ivas_format == MASA_FORMAT ) { +#ifndef FIX_959_MASA_LINEAR_REND if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC ) { *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal ); @@ -1132,7 +1133,9 @@ ivas_error ivas_jbm_dec_render( return error; } } - else if ( st_ivas->renderer_type == RENDERER_DIRAC ) + else +#endif + if ( st_ivas->renderer_type == RENDERER_DIRAC ) { ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); } diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c index 34bfbb57fa..6aa97062ad 100644 --- a/lib_dec/ivas_output_config.c +++ b/lib_dec/ivas_output_config.c @@ -371,7 +371,11 @@ void ivas_renderer_select( { *internal_config = IVAS_AUDIO_CONFIG_HOA3; } +#ifdef FIX_959_MASA_LINEAR_REND + *renderer_type = RENDERER_SBA_LINEAR_DEC; +#else st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC; +#endif } else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) || ( ivas_format == SBA_FORMAT && ( output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_MONO ) ) ) -- GitLab From cf636c075e9880ceac4385a23d98d576ad2ddaa2 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 30 Jan 2024 09:01:50 +0100 Subject: [PATCH 2/2] address MR review comment --- lib_dec/ivas_jbm_dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 7adedae280..dc394dda02 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1152,9 +1152,10 @@ ivas_error ivas_jbm_dec_render( return error; } } - else + else if ( st_ivas->renderer_type == RENDERER_DIRAC ) +#else + if ( st_ivas->renderer_type == RENDERER_DIRAC ) #endif - if ( st_ivas->renderer_type == RENDERER_DIRAC ) { ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output ); } -- GitLab