Commit efb90fa1 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC

parent 5703b942

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC             /* Eri: BASOP issue 2563: Crash in hq_generic decoding. EVS code --> solve with _sat operator */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_BASOP_2560_STEREO_DFT_DEC_RESET             /* FhG: BASOP issue 2560: align reset of hStereoDft->res_gains_ind_fx[][] between BASOP and float */

#define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */

lib_com/swb_bwe_com_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2748,11 +2748,7 @@ void hq_generic_decoding_fx( 
    tmp1_fx = extract_h( L_shl( L_tmp1, exp1 ) );

    tmp2_fx = extract_h( L_shl( L_tmp2, exp2 ) );

    tmp3_fx = div_s( tmp2_fx, tmp1_fx ); /*15 + exp2 + 15 - (exp1 + 15) */

#ifdef FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC

    tmp3_fx = shr_sat( tmp3_fx, add( 5, sub( exp2, exp1 ) ) ); /*10 */

#else

    tmp3_fx = shr( tmp3_fx, add( 5, sub( exp2, exp1 ) ) ); /*10 */

#endif



    if ( LT_16( tmp3_fx, 307 /*0.3 in Q10 */ ) )

    {