Commit 52149ff1 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR

parent 5c5c6f1c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define FIX_587_DEFAULT_REVERB                          /* Philips: issue 587: inconsistent default reverb parameters across renderers */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

lib_enc/ivas_masa_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -2650,16 +2650,8 @@ 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 */