Commit 771e2951 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

use SetTCXModeInfo also for EVS

parent 29bb6486

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */

#define HARMONIZE_2494_FdCng_decodeSID_fx               /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */

#define FIX_BASOP_2509_EVS_CONCEAL_UNINIT_MEM           /* FhG: BASOP 2509: st->hTcxCfg->psychParamsCurrent is not initialized */

#define HARMONIZE_2537_SetTCXModeInfo                   /* FhG: Harmonize SetTCXModeInfo */



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

lib_enc/pre_proc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1264,7 +1264,11 @@ void pre_proc_fx( 
         * TCX mode decision

         *---------------------------------------------------------------*/



#ifdef HARMONIZE_2537_SetTCXModeInfo

        SetTCXModeInfo_ivas_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#else

        SetTCXModeInfo_fx( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );

#endif

    }



    /*-----------------------------------------------------------------*

lib_enc/prot_fx_enc.h

+2 −1
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ void SetTCXModeInfo_ivas_fx( 
    Word16 *tcxModeOverlap    /* o  : window overlap of current frame */

);



#ifndef HARMONIZE_2537_SetTCXModeInfo

/** Set TCX window length and overlap configuration

 * @param prevEnergyHF previous HF energy. Exponent must be the same as for currEnergyHF.

 * @param currEnergyHF current HF energy. Exponent must be the same as for prevEnergyHF.
@@ -962,7 +963,7 @@ void SetTCXModeInfo_fx( 
    Encoder_State *st,

    TRAN_DET_HANDLE hTranDet,

    Word16 *tcxModeOverlap );



#endif

void GSC_enc_init_fx(

    GSC_ENC_HANDLE hGSCEnc /* i/o: GSC data handle  */

);

lib_enc/transient_detection_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ void SetTCXModeInfo_ivas_fx( 
    return;

}





#ifndef HARMONIZE_2537_SetTCXModeInfo

/*-------------------------------------------------------------------*

 * SetTCXModeInfo()

 *
@@ -1037,7 +1037,7 @@ void SetTCXModeInfo_fx( 


    return;

}



#endif



/************************************************/

/*                                              */