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

Merge branch '3gpp_issue_984_fix' into 'main' 

Fix for 3GPP issue 984: Decoder crash for Stereo at 24.4 / 32 kbps JBM...

See merge request !736
parents 8b11041b d355b48b

lib_com/gs_gains_fx.c

+7 −7
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void Comp_and_apply_gain_ivas_fx( 
             * y_gain  = pow(10.0, (Ener_per_bd_iQ[i_band]-Ener_per_bd_yQ[i_band]))

             * = pow(2, 3.321928*(Ener_per_bd_iQ[i_band]-Ener_per_bd_yQ[i_band]))

             *-----------------------------------------------------------------*/

            L16 = sub( Ener_per_bd_iQ[i_band], Ener_per_bd_yQ[i_band] ); /*Q12 */

            L16 = sub_sat( Ener_per_bd_iQ[i_band], Ener_per_bd_yQ[i_band] ); /*Q12 */

            L32 = L_mult( L16, 27213 );                                      /* 3.321928 in Q13 -> Q26 */

            L32 = L_shr( L32, 10 );                                          /* From Q26 to Q16 */

            frac = L_Extract_lc( L32, &exp1 );                               /* Extract exponent of gcode0 */

lib_com/gs_noisefill_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1338,9 +1338,9 @@ void highband_exc_dct_in_ivas_fx( 
        {

            FOR( i = 0; i < last_bin; i++ )

            {

                Ener_per_bd_iQ[i] = s_min( Ener_per_bd_iQ[i], sub( add( lt_ener_per_band_fx[i], 1229 ), Ener_per_bd_yQ[i] ) );

                Ener_per_bd_iQ[i] = s_min( Ener_per_bd_iQ[i], sub_sat( add( lt_ener_per_band_fx[i], 1229 ), Ener_per_bd_yQ[i] ) );

                move16();

                lt_ener_per_band_fx[i] = sub( lt_ener_per_band_fx[i], 77 );

                lt_ener_per_band_fx[i] = sub_sat( lt_ener_per_band_fx[i], 77 );

                move16();

            }

            FOR( ; i < MBANDS_GN; i++ )