Commit 0ff4eeac authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Remove whitespace changes to reduce unnecessary code difference.

parent 0c0c9fd1

lib_com/bits_alloc.c

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static ivas_error acelp_FCB_allocator( 
        nBits_tmp = 0;

    }

    *nBits -= nBits_tmp * nb_subfr;



    /* try to increase the FCB bit-budget of the first subframe(s) */

    step = fcb_table( cdbk + 1, L_subfr ) - nBits_tmp;

    while ( *nBits >= step )

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ 
#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */

#define FIX_673_OMASA_OBJ_MD_SYNC                       /* Nokia: Fix issue 673 by updating metadata in the third subframe to account for audio delay. */





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



/* #################### Start NON-BE CR switches ########################## */

lib_enc/ivas_masa_enc.c

+4 −1
Original line number Diff line number Diff line
@@ -3531,9 +3531,11 @@ static void ivas_encode_masaism_metadata( 
    /* use the values from hQMetaData */

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

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



    if ( numCodingBands != omasa_nbands )

    {

        assert( numCodingBands == 1 );



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

        {

            if ( sum_f( hOmasaData->energy_ism[sf], omasa_nbands ) == 0.0f )
@@ -3576,6 +3578,7 @@ static void ivas_encode_masaism_metadata( 
    else if ( numSf != omasa_nblocks )

    {

        assert( numSf == 1 );



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

        {

            energy_ism = 0.0f; /* ISM energy for current subband */
@@ -3666,6 +3669,7 @@ static void ivas_encode_masaism_metadata( 


                /* Quantize ISM ratios */

                quantize_ratio_ism_vector( ratio_ism[band], ratio_ism_idx[band], nchan_ism, hQMetaData->masa_to_total_energy_ratio[sf][band], idx_separated_object );



                if ( n_ism_tmp == numCodingBands && ratio_ism_idx[band][idx_separated_object] != 0 && hQMetaData->masa_to_total_energy_ratio[sf][band] < MASA2TOTAL_THR )

                {

                    i = 0;
@@ -3692,7 +3696,6 @@ static void ivas_encode_masaism_metadata( 
            {

                /* rotate components */

                rotate = 1;



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

                {

                    if ( hQMetaData->masa_to_total_energy_ratio[sf][band] < MASA2TOTAL_THR )