From 5a8736249252c99ce86574bfdfd381d45711d45f Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Mon, 10 Jun 2024 12:23:48 +0530 Subject: [PATCH 1/2] Fix for issue#780:MASA 2 TC output difference --- lib_dec/cng_dec_fx.c | 1 + lib_dec/ivas_cpe_dec_fx.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c index 6377fa019..802e6772c 100644 --- a/lib_dec/cng_dec_fx.c +++ b/lib_dec/cng_dec_fx.c @@ -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; } diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c index 4ff50cb31..2ab89940d 100644 --- a/lib_dec/ivas_cpe_dec_fx.c +++ b/lib_dec/ivas_cpe_dec_fx.c @@ -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 ) ) -- GitLab From fe52a9ceb27f11ead3bc64dd4993072e4dbcf794 Mon Sep 17 00:00:00 2001 From: Sandesh Venkatesh Date: Mon, 10 Jun 2024 12:30:10 +0530 Subject: [PATCH 2/2] clang formatting changes --- lib_dec/cng_dec_fx.c | 2 +- lib_dec/ivas_cpe_dec_fx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_dec/cng_dec_fx.c b/lib_dec/cng_dec_fx.c index 802e6772c..d75b598f2 100644 --- a/lib_dec/cng_dec_fx.c +++ b/lib_dec/cng_dec_fx.c @@ -1341,7 +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); + Scale_sig( shb_synth_fx, L_FRAME48k, -3 ); ResetSHBbuffer_Dec_fx( st ); return; } diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c index 2ab89940d..a7d4daaae 100644 --- a/lib_dec/ivas_cpe_dec_fx.c +++ b/lib_dec/ivas_cpe_dec_fx.c @@ -301,7 +301,7 @@ ivas_error ivas_cpe_dec_fx( } /* read DFT Stereo side info */ - 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 ) ); + 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 ) ) -- GitLab