Commit 186bdf69 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN

parent 16bcecd7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 


#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX_ISSUE_2206_MDCT_STEREO_FIX_2549       /* FhG: Correct scale inconsistency of old_inp_16k_fx buffer scale. */

#define FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN     /* FhG: fixes obvious bug for IVAS path. For EVS path, issue is still not resolved */

#define FIX_FMSW_DEC                                    /* float issue 1542: fix JBM issue in format switching */

#define FIX_FMSW_DEC_2                                  /* float issue 1575: fix crash for format switching when bitsream starts with EVS */

#define FIX_BASOP_2562_HQ_PREECHO_SAT                   /* Eri/Orange: Basop issue 2562: Add saturation to L_add in preecho calculations */

lib_enc/tcx_utils_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -3002,7 +3002,6 @@ void ProcessIGF_fx( 
    }



    test();

#ifdef FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        // this is a bug in the EVS legacy code, the IVAS branch is correct - don't fix for now, to keep EVS bit-exact
@@ -3012,9 +3011,6 @@ void ProcessIGF_fx( 
    {

        tns_predictionGain = L_deposit_h( hIGFEnc->tns_predictionGain );

    }

#else

    tns_predictionGain = L_deposit_l( hIGFEnc->tns_predictionGain );

#endif

    IF( LT_32( tns_predictionGain, ONE_POINT_ONE_FIVE_Q23 ) && LT_16( predictionGain, ONE_POINT_ONE_FIVE_Q7 ) )

    {

        hIGFEnc->flatteningTrigger = 1;