Commit 4bb11f05 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

reactivated HARMONIZE_2583_open_decoder_LPD - fixed EVS path

parent f4d5a3dd

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
//#define HARMONIZE_2553_TonalConceal_Init                /* FhG: Harmonize TonalMDCTConceal_Init with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveFreqSignal      /* FhG: Harmonize TonalConceal_SaveFreqSignal with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveTimeSignal      /* FhG: Harmonize TonalConceal_SaveTimeSignal with its ivas derivate */

//#define HARMONIZE_2583_open_decoder_LPD             /* FhG: harmonize open_decoder_LPD between EVS and IVAS versions */

#define HARMONIZE_2583_open_decoder_LPD             /* FhG: harmonize open_decoder_LPD between EVS and IVAS versions */



/* #################### End BE switches ################################## */

lib_dec/core_dec_init_fx.c

+14 −2
Original line number Diff line number Diff line
@@ -2297,10 +2297,22 @@ void open_decoder_LPD_ivas_fx( 
    {

        st->enablePlcWaveadjust = 1;

        move16();



#ifdef HARMONIZE_2583_open_decoder_LPD

        Word16 last_total_brate_condition;

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

        {

            last_total_brate_condition = LT_32( last_total_brate, HQ_48k );

        }

        ELSE

        {

            last_total_brate_condition = LT_32( st->last_total_brate, HQ_48k );

        }

        IF( st->hTcxDec != NULL && ( st->ini_frame == 0 || last_total_brate_condition || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset ) )

#else

        IF( st->hTcxDec != NULL && ( st->ini_frame == 0 || LT_32( last_total_brate, HQ_48k ) || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset ) )

#endif

        {

            concealment_init_x( st->hTcxDec->L_frameTCX, st->hPlcInfo );

            concealment_init_x( hTcxDec->L_frameTCX, st->hPlcInfo );

        }

    }

    ELSE