Commit c8d13af3 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

parent add3b604

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
#define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */

#define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex 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_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/2_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

//#define HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/2_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */



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

lib_dec/tonalMDCTconcealment_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k, 64, 1, 1, &hTonalMDCTConc->psychParamsTCX20 );

        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k / 2, 64, 0, 1, &hTonalMDCTConc->psychParamsTCX10 );

        hTonalMDCTConc->psychParams = NULL;



        hTonalMDCTConc->last_block_nrg = 0;

        move16();

        hTonalMDCTConc->last_block_nrg_exp = 0;
@@ -280,7 +281,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        set16_fx( hTonalMDCTConc->timeDataBuffer, 0, ( 3 * L_FRAME_MAX ) / 2 );

    }



    hTonalMDCTConc->secondLastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - ( 3 * s_min( L_FRAME_MAX, nSamples ) / 2 )];

    hTonalMDCTConc->secondLastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - ( 3 * ( s_min( L_FRAME_MAX, nSamples ) ) / 2 )];

    hTonalMDCTConc->lastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - s_min( L_FRAME_MAX, nSamples )];

    /* If the second last frame was lost, we reuse saved TonalComponentsInfo and don't update pcm buffers */

    assert( sizeof( *hTonalMDCTConc->pTCI ) <= ( hTonalMDCTConc->lastPcmOut - hTonalMDCTConc->timeDataBuffer ) * sizeof( hTonalMDCTConc->timeDataBuffer[0] ) );