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

Merge branch '3gpp_issue_1156_fix' into 'main' 

Fix for 3GPP issue 1156: Encoder crash for Stereo at 32kbps in SWB_BWE_encoding_ivas_fx()

See merge request !952
parents aab60543 0c8d3f17

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -115,4 +115,5 @@ 
#define FIX_ISSUE_1154                          /* Ittiam: Fix for Issue 1154: Encoder crash for ParamMC 7.1 at 96kbps in ivas_param_mc_param_est_enc_fx() */

#define FIX_ISSUE_1157                          /* Ittiam: Fix for Issue 1157: Encoder crash for Stereo at 48/64kbps DTX on/off in kernel_switch_trafo_fx() */

#define FIX_ISSUE_1152                          /* Ittiam: Fix for issue 1152: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from find_tilt_fx function*/

#define FIX_ISSUE_1156                          /* Ittiam: Fix for Issue 1156: Encoder crash for Stereo at 32kbps in SWB_BWE_encoding_ivas_fx() */

#endif

lib_enc/swb_bwe_enc_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -3349,7 +3349,15 @@ static Word16 SWB_BWE_encoding_ivas_fx( 
            expn = sub( sub( 30, expn ), sub( shl( Q_insig_lp, 1 ), 7 ) );



            expd = norm_l( WB_tenv_syn_fx );

#ifdef FIX_ISSUE_1156

#ifdef BASOP_NOGLOB

            den = round_fx_o( L_shl( WB_tenv_syn_fx, expd ), &Overflow );

#else

            den = round_fx( L_shl( WB_tenv_syn_fx, expd ) );

#endif

#else

            den = round_fx( L_shl( WB_tenv_syn_fx, expd ) );

#endif

            expd = sub( sub( 30, expd ), sub( shl( st_fx->Q_syn2, 1 ), 7 ) );



            scale = shr( sub( den, num ), 15 );