Commit 8d7d2d73 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

harmonize different macros

parent e4b18b4b

lib_com/core_com_config_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ Word16 getTcxLpcShapedAri( 
 * Initialization of TCX

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



#ifdef HARMONIZE_2567_init_tcx_cfg

#ifdef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

#else

void init_tcx_cfg_ivas_fx(
@@ -845,7 +845,7 @@ void init_tcx_cfg_ivas_fx( 
    const Word16 infoIGFStopFreq, /*Q0*/

    const Word16 element_mode,    /*Q0*/

    const Word16 ini_frame,       /*Q0*/

#ifdef HARMONIZE_2567_init_tcx_cfg

#ifdef HARMONIZE_2567_init_functions

    const Word16 MCT_flag, /*Q0*/

    const Word16 fscaleFB /*Q0*/ )

#else
@@ -868,7 +868,7 @@ void init_tcx_cfg_ivas_fx( 
    hTcxCfg->tcx_mdct_window_length_old = hTcxCfg->tcx_mdct_window_length; /*Q0*/

    move16();

    mdctWindowLength = getMdctWindowLength_fx( fscale ); /*Q0*/

#ifdef HARMONIZE_2567_init_tcx_cfg

#ifdef HARMONIZE_2567_init_functions

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        mdctWindowLengthFB = getMdctWindowLength_fx( fscaleFB ); /*Q0*/
@@ -1100,7 +1100,7 @@ void init_tcx_window_cfg_fx( 
    return;

}



#ifndef HARMONIZE_2567_init_tcx_cfg

#ifndef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,     /*Q0*/

lib_com/options.h

+1 −6
Original line number Diff line number Diff line
@@ -107,12 +107,7 @@ 
#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */



#define HARMONIZE_2567_init_acelp                       /* FhG: harmonize init_acelp derivates for evs/ivas  */

#define HARMONIZE_2567_init_tcx_cfg                     /* FhG: harmonize init_tcx_cfg derivates for evs/ivas  */

#define HARMONIZE_2567_init_tcx                         /* FhG: harmonize init_tcx derivates for evs/ivas  */

#define HARMONIZE_2567_init_coder_ace_plus              /* FhG: harmonize init_coder_ace_plus derivates for evs/ivas  */

#define HARMONIZE_2567_init_core_sig_ana                /* FhG: harmonize init_core_sig_ana derivates for evs/ivas  */

//#define HARMONIZE_2567_init_modes                       /* FhG: harmonize init_modes derivates for evs/ivas  */

#define HARMONIZE_2567_init_functions                   /* FhG: harmonize derivates for evs/ivas regarding functions init_acelp*(),init_tcx_cfg*(), init_tcx*(), init_coder_ace_plus*(), init_core_sig_ana*() and init_modes*() */



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

lib_com/prot_fx.h

+4 −4
Original line number Diff line number Diff line
@@ -5758,7 +5758,7 @@ void init_tcx_window_cfg_fx( 
    const Word16 element_mode        /* i  : mode of CPE/SCE          */

);



#ifndef HARMONIZE_2567_init_tcx_cfg

#ifndef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,
@@ -9587,7 +9587,7 @@ void writeTCXparam_fx( 
    const Word16 target_bitsTCX10[2],

    const Word16 pre_past_flag );



#ifdef HARMONIZE_2567_init_coder_ace_plus

#ifdef HARMONIZE_2567_init_functions

void init_coder_ace_plus_fx(

    Encoder_State *st,             /* i  : Encoder state                          */

    const Word32 last_total_brate, /* i  : last total bitrate                     */
@@ -9621,7 +9621,7 @@ void SetModeIndex_ivas_fx( 
    const Word16 MCT_flag           /* i  : hMCT handle allocated (1) or not (0)   Q0*/

);



#ifdef HARMONIZE_2567_init_tcx_cfg

#ifdef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

#else

void init_tcx_cfg_ivas_fx(
@@ -9641,7 +9641,7 @@ void init_tcx_cfg_ivas_fx( 
    const Word16 infoIGFStopFreq, /*Q0*/

    const Word16 element_mode,    /*Q0*/

    const Word16 ini_frame,       /*Q0*/

#ifdef HARMONIZE_2567_init_tcx_cfg

#ifdef HARMONIZE_2567_init_functions

    const Word16 MCT_flag, /*Q0*/

    const Word16 fscaleFB /*Q0*/ );

#else

lib_enc/core_enc_init_fx.c

+71 −100

File changed.

Preview size limit exceeded, changes collapsed.

lib_enc/core_enc_switch_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ void core_coder_mode_switch_fx( 
    {

        st->igf = getIgfPresent_fx( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );

        move16();

#ifdef HARMONIZE_2567_init_coder_ace_plus

#ifdef HARMONIZE_2567_init_functions

        assert( st->element_mode == EVS_MONO );

        init_coder_ace_plus_fx( st, last_total_bitrate, 0, shift, MCT_flag );

#else
@@ -402,7 +402,7 @@ void core_coder_mode_switch_ivas_fx( 
        move16();

#endif



#ifdef HARMONIZE_2567_init_coder_ace_plus

#ifdef HARMONIZE_2567_init_functions

        assert( st->element_mode != EVS_MONO );

        init_coder_ace_plus_fx( st, last_total_brate, st->total_brate, 0, MCT_flag );

#else