From dfed9d46557e19c702c98b3bfeacb1d29d7c71db Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 7 Nov 2023 15:05:07 +0100 Subject: [PATCH 1/2] issue 881: remove LFE addition in ISM format; under FIX_881_REMOVE_LFE_ADDITION_IN_ISM --- lib_com/options.h | 1 + lib_dec/ivas_dec.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 7b61ed4b4a..9195d5f2cc 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -156,6 +156,7 @@ #define FIX_890_ARRAY_SIZE /* Nokia: issue #890: mismatch in 2D array size declaration and use */ #define BE_FIX_887_GCC_WARNING_ARRAY_SIZE /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */ #define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */ +#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index 04a0cf6b20..bf25c6cbef 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -304,8 +304,9 @@ ivas_error ivas_dec( { return error; } - +#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output ); +#endif } #ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) -- GitLab From 31f538e1a74a34e32490653c4e0a2ab5ae434363 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 7 Nov 2023 15:07:14 +0100 Subject: [PATCH 2/2] add FIX_881_REMOVE_LFE_ADDITION_IN_ISM to the JBM part --- lib_dec/ivas_jbm_dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 9229336f78..24f8608f73 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -1097,8 +1097,9 @@ ivas_error ivas_jbm_dec_render( { return error; } - +#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_output, p_output ); +#endif } #ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) @@ -1640,8 +1641,9 @@ ivas_error ivas_jbm_dec_flush_renderer( { return error; } - +#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, p_output, p_output ); +#endif } } else -- GitLab