Commit ed7137ca authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_780_fix' into 'main' 

Fix for issue#780: MASA 2 TC output difference

See merge request !368
parents 0ba50bb0 fe52a9ce

lib_dec/cng_dec_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,7 @@ static void shb_CNG_decod_ivas_fx( 
        interpolate_3_over_2_allpass_fx( shb_synth_fx, L_FRAME32k, shb_synth_fx, st->interpol_3_2_cng_dec_fx, allpass_poles_3_ov_2 );

    }



    Scale_sig( shb_synth_fx, L_FRAME48k, -3 );

    ResetSHBbuffer_Dec_fx( st );

    return;

}

lib_dec/ivas_cpe_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ ivas_error ivas_cpe_dec_fx( 
            }



            /* read DFT Stereo side info */

            nb_bits = extract_l( L_sub( ( hCPE->element_brate / FRAMES_PER_SEC ), Mpy_32_16_1( 26214, sts[0]->bits_frame_nominal ) ) ); // 0.8f in q15 = 26214

            nb_bits = extract_h( L_msu( Mpy_32_16_1( L_shl( hCPE->element_brate, 15 ), 1311 /* 1/FRAMES_PER_SEC in Q16*/ ), 26214, sts[0]->bits_frame_nominal ) );

            cpe_brate = st_ivas->hCPE[0]->element_brate;

            move32();

            IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )