Commit 0acd088c authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit and fix ivas-branch-condition

parent b90ef3a4

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define HARMONIZE_2598_tcx_arith_encode_envelope        /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */

#define FIX_ISSUE_2594_FALSE_COMMENT                    /* FhG: basop issue 2594: fixing false comments about Q value*/

#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*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage1 /*devlop: reharmonize tonalconcealmen-init*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage2 /*devlop: reharmonize tonalconcealmen-init*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage3 /*devlop: reharmonize tonalconcealmen-init*/

lib_dec/core_dec_init_fx.c

+0 −3
Original line number Diff line number Diff line
@@ -2346,9 +2346,6 @@ void open_decoder_LPD_ivas_fx( 
        ELSE

        {

#endif

            /*TODO ber:del assert*/

            assert( NE_16( st->element_mode, EVS_MONO ) );

            assert( GT_16( st->element_mode, EVS_MONO ) );



            TonalMDCTConceal_Init_ivas_fx( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#ifdef HARMONIZE_2583_open_decoder_LPD

lib_dec/tonalMDCTconcealment_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    IF( NE_16( element_mode, EVS_MONO ) )

    {

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/