Commit 7c2ead56 authored by vasilache's avatar vasilache
Browse files

fix energy ratios 2

parent 6b858731

lib_dec/ivas_masa_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -4377,8 +4377,8 @@ static void create_masa_ext_out_meta_fx( 
            {

                FOR( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )

                {

                    #if 1

                    IF (EQ_32(hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], 1073741824))

#ifdef FIX_953_WRONG_ENERGY_RATIO_MASA_EXT

                    IF (EQ_32(hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf], ONE_IN_Q30 ))

                    {

                        hQMetaData->q_direction[dir].band_data[b_old].energy_ratio_fx[sf]--;

                    }

lib_dec/ivas_qmetadata_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,16 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512( 
    IF( EQ_32( hQMetaData->no_directions, 2 ) )

    {

#ifdef MSAN_FIX

        #if 1

        FOR( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ )

        {

            FOR( m = 0; m < hQMetaData->q_direction[0].cfg.nblocks; m++ )

            {

                hQMetaData->q_direction[1].band_data[b].energy_ratio_fx[m] = W_round64_L( W_nrg_ratio[1][b][m] ); /*Q30*/

                move32();

            }

        }

        #else

        FOR( b = 0; b < hQMetaData->q_direction[1].cfg.nbands; b++ )

        {

            FOR( m = 0; m < hQMetaData->q_direction[1].cfg.nblocks; m++ )
@@ -1840,6 +1850,7 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512( 
                move32();

            }

        }

        #endif

#else

        FOR( b = 0; b < MASA_MAXIMUM_CODING_SUBBANDS; b++ )

        {