Commit c7156d5b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

parent 5a8cff59

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define FIX_2255_ISAR_RENDER_POSES                      /* VA: issue 2255: fix missing check in isar_render_poses() */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

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

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */

lib_enc/ivas_masa_enc_fx.c

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

    }



#ifdef FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

    IF( GT_16( hMasa->config.numTwoDirBands, 0 ) )

    {

#endif

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

        /* Reduced precision of importance_fx intentionally to Q13 to maintatin 0.0001f resolution */

        FOR( i = 0; i < numCodingBands; i++ )
@@ -1831,10 +1829,8 @@ void ivas_masa_combine_directions_fx( 


        /* Determine bands where to use two directions */

        find_n_largest_fx( importance_fx, exp_importance, indicesOfLargest, numCodingBands, hMasa->config.numTwoDirBands );

#ifdef FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA

    }



#endif



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

    {