diff --git a/lib_com/options.h b/lib_com/options.h index f778b2ed4f3614446fafd4515bae58ab5b3b12db..25d559cae04133a1fda1c739c32edb84f9c503d0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -129,6 +129,7 @@ #define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER /* FhG: issue 1128: set output ambisonics order to input order for EXT output */ #define FIX_1138_SBA_EXT_ERROR_PRINTOUT /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */ #define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */ +#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c index 0c87faa4e5441a9ef0e1035723eb02723bdfa6d9..cfd2aaef4914da21f10f31288580307cb19fcee9 100644 --- a/lib_enc/ivas_masa_enc_fx.c +++ b/lib_enc/ivas_masa_enc_fx.c @@ -2667,11 +2667,16 @@ static void reduce_metadata_further_fx( /* Copy spread coherence to the rest of subframes for the coherence coding algorithm. */ FOR( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ ) { +#ifdef NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR + hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0 + move16(); +#else FOR( band = 0; band < numCodingBands; band++ ) { hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0 move16(); } +#endif } /* Surround coherence is already merged through time */