Commit 76c1d7a6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch 'float-1501-uninitialized-value-in-ivas_masa_combine_directions-with-omasa-input' into 'main'

Resolve "Uninitialized value in ivas_masa_combine_directions with OMASA input"

See merge request !2713
parents 5e6b4954 60482a69

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#define HARM_NON_LINEARITY                              /* VA: basop issue 2345: Remove duplicated code in core-coder: non_linearity_fx() and LP CNG */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_2334_HARM_CODER_MODIF                       /* VA: basop issue 2334 : harmonizing coder_modif_function */

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



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

lib_enc/ivas_masa_enc_fx.c

+27 −19
Original line number Diff line number Diff line
@@ -1800,6 +1800,10 @@ 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++ )
@@ -1827,6 +1831,10 @@ 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++ )

    {