Commit 47e354cc authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1013_fix' into 'main' 

Fix for 3GPP issue 1013: Crash in ivas_hq_core_dec_fx() for MC 5.1 at 32kbps JBM 16kHz out

See merge request !784
parents 13adc669 61c3c69e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -80,4 +80,5 @@ 
#define SIMPLIFY_CODE_BE   // Simplify synthesis loop

#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */

#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */

#define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */

#endif

lib_com/trans_inv_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -531,7 +531,11 @@ void preecho_sb_fx( 
                        tmp_fx1 = norm_l( es_mdct_fx[i] );

                        tmp_fxL1 = L_shl( es_mdct_fx[i], tmp_fx1 );

                        tmp_fxL2 = L_shl( mean_prev_fx_loc, tmp_fx1 );

#ifdef FIX_1013_CRASH_HQ_CORE_DEC

                        tmp_fx1 = round_fx_sat( tmp_fxL1 );

#else

                        tmp_fx1 = round_fx( tmp_fxL1 );

#endif

                        tmp_fx2 = round_fx( tmp_fxL2 );

                        tmp_fx3 = div_s( tmp_fx2, tmp_fx1 );

                        min_g_fx[i] = Frac_sqrt( tmp_fx3 );