Commit 3c53d4d8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_675_WB_OMASA

parent eb223f5e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






#define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */

#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */

#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

lib_enc/ivas_masa_enc.c

+0 −28
Original line number Diff line number Diff line
@@ -3538,23 +3538,14 @@ static void ivas_encode_masaism_metadata( 
    int16_t tmp, rotate;

    int16_t n_ism_tmp, i;

    OMASA_ENCODER_DATA_HANDLE hOmasaData = hMasa->data.hOmasaData;

#ifdef FIX_675_WB_OMASA

    int16_t nbands_work;

#endif



    /* use the values from hQMetaData */

    numCodingBands = (uint8_t) hQMetaData->q_direction->cfg.nbands;

    numSf = (int8_t) hQMetaData->q_direction->cfg.nblocks;

#ifdef FIX_675_WB_OMASA

    nbands_work = min( numCodingBands, omasa_nbands );

    if ( numCodingBands == 1 )

#else

    if ( numCodingBands != omasa_nbands )

#endif

    {

#ifndef FIX_675_WB_OMASA

        assert( numCodingBands == 1 );

#endif

        for ( sf = 0; sf < numSf; sf++ )

        {

            if ( sum_f( hOmasaData->energy_ism[sf], omasa_nbands ) == 0.0f )
@@ -3594,20 +3585,9 @@ static void ivas_encode_masaism_metadata( 
            }

        }

    }

#ifdef FIX_675_WB_OMASA

    else if ( numSf == 1 )

#else

    else if ( numSf != omasa_nblocks )

#endif

    {

#ifndef FIX_675_WB_OMASA

        assert( numSf == 1 );

#endif

#ifdef FIX_675_WB_OMASA

        for ( band = 0; band < nbands_work; band++ )

#else

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

#endif

        {

            energy_ism = 0.0f; /* ISM energy for current subband */

            for ( obj = 0; obj < nchan_ism; obj++ )
@@ -3647,7 +3627,6 @@ static void ivas_encode_masaism_metadata( 
                hOmasaData->masa_to_total_energy_ratio[0][band] = eneBand / ( eneBand + energy_ism + EPSILON );

            }

        }

#ifdef FIX_675_WB_OMASA

        for ( band = nbands_work; band < numCodingBands; band++ )

        {

            hOmasaData->masa_to_total_energy_ratio[0][band] = 1.0f;
@@ -3657,17 +3636,12 @@ static void ivas_encode_masaism_metadata( 
                hOmasaData->energy_ratio_ism[0][band][obj] = hOmasaData->energy_ratio_ism[0][nbands_work - 1][obj];

            }

        }

#endif

    }

    else

    {

        for ( sf = 0; sf < numSf; sf++ )

        {

#ifdef FIX_675_WB_OMASA

            for ( band = 0; band < nbands_work; band++ )

#else

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

#endif

            {

                if ( hOmasaData->energy_ism[sf][band] == 0.0f )

                {
@@ -3686,7 +3660,6 @@ static void ivas_encode_masaism_metadata( 
                    hOmasaData->masa_to_total_energy_ratio[sf][band] = eneBand / ( eneBand + hOmasaData->energy_ism[sf][band] + EPSILON );

                }

            }

#ifdef FIX_675_WB_OMASA

            for ( band = nbands_work; band < numCodingBands; band++ )

            {

                hOmasaData->masa_to_total_energy_ratio[sf][band] = 1.0f;
@@ -3696,7 +3669,6 @@ static void ivas_encode_masaism_metadata( 
                    hOmasaData->energy_ratio_ism[sf][band][obj] = hOmasaData->energy_ratio_ism[sf][nbands_work - 1][obj];

                }

            }

#endif

        }

    }

    ivas_omasa_encode_masa_to_total( hOmasaData->masa_to_total_energy_ratio, hMetaData, low_bitrate_mode, numCodingBands, numSf );