Commit 457f9707 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2567-harmonize-init_acelp-init_tcx-init_coder_ace_plus-init_core_sig_ana-init_modes' into 'main'

Resolve "Harmonize init_acelp, init_tcx, init_coder_ace_plus, init_core_sig_ana, init_modes, init_sig_buffers, init_tcx_cfg"

Closes #2567

See merge request !3004
parents c8b0e506 50965461

lib_com/core_com_config_fx.c

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

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



#ifdef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

#else

void init_tcx_cfg_ivas_fx(

#endif

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,     /*Q0*/

    const Word32 sr_core,         /*Q0*/
@@ -841,7 +845,12 @@ void init_tcx_cfg_ivas_fx( 
    const Word16 infoIGFStopFreq, /*Q0*/

    const Word16 element_mode,    /*Q0*/

    const Word16 ini_frame,       /*Q0*/

#ifdef HARMONIZE_2567_init_functions

    const Word16 MCT_flag, /*Q0*/

    const Word16 fscaleFB /*Q0*/ )

#else

    const Word16 MCT_flag /*Q0*/ )

#endif

{

    Word16 i;

    Word16 mdctWindowLength;
@@ -859,7 +868,11 @@ 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_functions

    mdctWindowLengthFB = getMdctWindowLength_fx( fscaleFB ); /*Q0*/ /* this replaces (int16_t) ( mdctWindowLength * input_Fs / sr_core ) as used in float */

#else

    mdctWindowLengthFB = (Word16) ( mdctWindowLength * input_Fs / sr_core );

#endif



    init_tcx_window_cfg_fx( hTcxCfg, sr_core, input_Fs, L_frame, L_frameTCX, mdctWindowLength, mdctWindowLengthFB, element_mode );

    /* SQ deadzone & memory quantization*/
@@ -1080,6 +1093,7 @@ void init_tcx_window_cfg_fx( 
    return;

}



#ifndef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,     /*Q0*/
@@ -1227,3 +1241,4 @@ void init_tcx_cfg_fx( 


    return;

}

#endif

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
#define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */

#define HARMONIZE_2597_ShapeSpectrum                    /* FhG: Harmonize ShapeSpectrum with its ivas derivate */



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



/* #################### Start NON-BE switches ############################ */

lib_com/prot_fx.h

+38 −16
Original line number Diff line number Diff line
@@ -3794,12 +3794,14 @@ void tcx_get_gain( 
    Word16 *en_y_e  /* o: energy of y exponent (optional) */

);



#ifndef HARMONIZE_2567_init_functions

void init_TCX_config(

    TCX_CONFIG_HANDLE hTcxCfg,

    Word16 L_frame,

    Word16 fscale,

    Word16 L_frameTCX,

    Word16 fscaleFB );

#endif



void resetTecDec_Fx(

    TEC_DEC_HANDLE hTecDec );
@@ -5725,6 +5727,7 @@ void init_tcx_window_cfg_fx( 
    const Word16 element_mode        /* i  : mode of CPE/SCE          */

);



#ifndef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,
@@ -5743,6 +5746,7 @@ void init_tcx_cfg_fx( 
    const Word16 ini_frame,

    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)  */,

    const Word16 fscaleFB );

#endif



void syn_output_fx(

    const Word16 codec_mode,   /* i  : MODE1 or MODE2                       */
@@ -9529,11 +9533,20 @@ void writeTCXparam_fx( 
    const Word16 target_bitsTCX10[2],

    const Word16 pre_past_flag );



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

    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */

    const Word16 shift,

    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */

#else

void init_coder_ace_plus_ivas_fx(

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

    const Word32 last_total_brate, /* i  : last total bitrate                     */

    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */

    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */

#endif

);



void core_coder_reconfig_ivas_fx(
@@ -9562,23 +9575,32 @@ void SetModeIndex_ivas_fx( 
#endif

);



#ifdef HARMONIZE_2567_init_functions

void init_tcx_cfg_fx(

#else

void init_tcx_cfg_ivas_fx(

#endif

    TCX_CONFIG_HANDLE hTcxCfg,

    const Word32 total_brate,

    const Word32 sr_core,

    const Word32 input_Fs,

    const Word16 L_frame,

    const Word16 bwidth,

    const Word16 L_frameTCX,

    const Word16 fscale,

    const Word16 preemph_fac,

    const Word16 tcxonly,

    const Word16 rf_mode,

    const Word16 igf,

    const Word16 infoIGFStopFreq,

    const Word16 element_mode,

    const Word16 ini_frame,

    const Word16 MCT_flag );

    const Word32 total_brate,     /*Q0*/

    const Word32 sr_core,         /*Q0*/

    const Word32 input_Fs,        /*Q0*/

    const Word16 L_frame,         /*Q0*/

    const Word16 bwidth,          /*Q0*/

    const Word16 L_frameTCX,      /*Q0*/

    const Word16 fscale,          /*Q0*/

    const Word16 preemph_fac,     /*Q15*/

    const Word16 tcxonly,         /*Q0*/

    const Word16 rf_mode,         /*Q0*/

    const Word16 igf,             /*Q0*/

    const Word16 infoIGFStopFreq, /*Q0*/

    const Word16 element_mode,    /*Q0*/

    const Word16 ini_frame,       /*Q0*/

#ifdef HARMONIZE_2567_init_functions

    const Word16 MCT_flag, /*Q0*/

    const Word16 fscaleFB /*Q0*/ );

#else

    const Word16 MCT_flag /*Q0*/ );

#endif



Word16 msvq_stage1_dct_search_fx(

    const Word32 *u_fx,                       /* i  : target                                        exp : u_e */

lib_com/tcx_utils_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -2157,6 +2157,7 @@ void tcx_get_gain( 
}





#ifndef HARMONIZE_2567_init_functions

void init_TCX_config(

    TCX_CONFIG_HANDLE hTcxCfg,

    Word16 L_frame,    /*Q0*/
@@ -2207,3 +2208,4 @@ void init_TCX_config( 


    return;

}

#endif

lib_enc/core_enc_init_fx.c

+299 −46

File changed.

Preview size limit exceeded, changes collapsed.