Commit 1f539ba7 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2313_HF_RESET_16KHZ

parent b1148c82

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2313_HF_RESET_16KHZ                         /* VA: basop issue 2313: Call hf_synth_reset_fx() also for 16 kHz output_Fs */

#define OPT_2308_FIND_TARGET                            /* VA: Issue 2308, Speeds up computation and improve accuracy of the impulse response */

#define OPT_NBE_2311_HARM_GSC_GAIN                      /* VA: issue 2311: non-BE part of the GSC gain harmonization */

#define FIX_2261_REMOVE_LP_RESCALING                    /* VA: Remove of unnecessary lpc coefficient rescaling */

lib_dec/core_switching_dec_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -1222,11 +1222,7 @@ ivas_error core_switching_pre_dec_fx( 
        move16();



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBV: tmp hack - it is a bug in EVS but condition is here to keep EVS bit-exact for the moment
@@ -1649,11 +1645,7 @@ ivas_error core_switching_pre_dec_fx( 
        }



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            IF( NE_16( st->element_mode, EVS_MONO ) ) // VE: TBV: tmp hack - it is a bug in EVS but condition is here to keep EVS bit-exact for the moment
@@ -1704,11 +1696,7 @@ ivas_error core_switching_pre_dec_fx( 
        move16();



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );