diff --git a/lib_com/options.h b/lib_com/options.h old mode 100755 new mode 100644 index 589026f910e30ecad5c9f6014863cfad26652f0a..7c0e9e7d5e2f8101843af938d2270f7d64fd79bf --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,6 +152,7 @@ #define FIX_643_PCA_OPTION /* VA: issue 643: rename PCA bypass command-line option */ #define FIX_902_HACK_IN_CORECODER /* VA: issue 902: remove a hack in ivas_core_dec() */ +#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */ /* #################### End BE switches ################################## */ #define FIX_899_VARIABLE_SPEED_DECODING /* FhG: Fix variable speed decoding */ diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index 04a0cf6b200ade2d6a987de79d766421a9c3d94b..bf25c6cbefbd8c3e65eec40486fae123a599f569 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 ) diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 42346986297283c018c5893cde1b684e068b0f4c..99f90aaa70f809336b67ee98f77aec3a69e0177a 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 ) @@ -1654,8 +1655,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