Commit 507fd13e 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 !2486
parents 4e61820e 7be087fb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

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

#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.c

+18 −11
Original line number Diff line number Diff line
@@ -1232,6 +1232,10 @@ 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++ )

        {
@@ -1247,7 +1251,10 @@ 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;