Commit 6b59c2b1 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

parent 4d351142

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */



/* #################### End BE switches ################################## */

lib_enc/ivas_masa_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -1232,10 +1232,8 @@ void ivas_masa_combine_directions( 
        }

    }



#ifdef FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

    if ( hMasa->config.numTwoDirBands > 0 )

    {

#endif

        /* Estimate the importance of having two directions instead of one */

        for ( i = 0; i < numCodingBands; i++ )

        {
@@ -1251,10 +1249,8 @@ void ivas_masa_combine_directions( 


        /* Determine bands where to use two directions */

        find_n_largest( importance, indicesOfLargest, numCodingBands, hMasa->config.numTwoDirBands );

#ifdef FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

    }



#endif

    for ( i = 0; i < numCodingBands; i++ )

    {

        hMasa->data.twoDirBands[i] = 0;