Commit c69ba984 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2524_MASA_REDUCE_META_BUG

parent 6fee154f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

#define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */

#define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */

#define FIX_2515_TDREND_PORT_ERROR_SCALING              /* Nokia: BASOP issue 2515: Fix port error by changing to correct scaling */

lib_enc/ivas_masa_enc_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -2599,26 +2599,16 @@ static void reduce_metadata_further_fx( 
        Word32 x, y, z;

        Word32 veclen, L_tmp;



#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG

        W_tmp = 0;

        move64();

#endif

        FOR( band = 0; band < numCodingBands; band++ )

        {

            xSum = 0;

            ySum = 0;

            zSum = 0;

#ifndef FIX_BASOP_2524_MASA_REDUCE_META_BUG

            bandSumEnergy = 0;

            move32();

#endif

            move32();

            move32();

            move32();

#ifdef FIX_BASOP_2524_MASA_REDUCE_META_BUG

            W_tmp = 0;

            move64();

#endif



            FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )

            {