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

re-setup macro HARMONIZE_2537_SetTCXModeInfo and code

parent 734c0677

lib_com/options.h

+3 −3
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ 
#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 */



/*Harmonize SetTCXModeInfo, GetTCXMaxenergyChange, GetTCXAvgTemporalFlatnessMeasure*/                                                        

//#define HARMONIZE_2537_SetTCXModeInfo                   /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green*/

/*Harmonize SetTCXModeInfo, GetTCXMaxenergyChange*/                                                        

#define HARMONIZE_2537_SetTCXModeInfo                 /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */

#define HARMONIZE_2537_GetTCXMaxenergyChange            /* FhG: Harmonize GetTCXMaxenergyChange */



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

lib_enc/ivas_core_pre_proc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -380,7 +380,11 @@ void pre_proc_ivas_fx( 
        }

        IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )

        {

#ifdef HARMONIZE_2537_SetTCXModeInfo

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

#else

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

#endif

        }

    }

    ELSE IF( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

lib_enc/ivas_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1290,7 +1290,11 @@ void ivas_mdct_core_whitening_enc_fx( 
        FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

            st = sts[ch];

#ifdef HARMONIZE_2537_SetTCXModeInfo

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

#else

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

#endif

        }

    }

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -211,7 +211,11 @@ void stereo_mdct_core_enc_fx( 
    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

    {

        st = sts[ch];

#ifdef HARMONIZE_2537_SetTCXModeInfo

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

#else

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

#endif

    }

    /* adaptively sync tcx modes*/

    test();

lib_enc/pre_proc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1264,11 +1264,7 @@ 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

    }



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