Commit 1c46576d authored by multrus's avatar multrus
Browse files

more harmonizations

parent 2b955a65

lib_com/core_com_config_fx.c

+9 −4
Original line number Diff line number Diff line
@@ -169,14 +169,13 @@ Word16 get_codec_mode( 
    return codec_mode; /*Q0*/

}





#ifdef FIX_2385_GETTCXONLY

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

 * getTcxonly_ivas()

 * getTcxonly()

 *

 *

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



#ifdef FIX_2385_GETTCXONLY

Word16 getTcxonly_fx(

    const Word16 element_mode, /* i  : IVAS element mode                    Q0*/

    const Word32 total_brate,  /* i  : total bitrate                        Q0*/
@@ -184,6 +183,12 @@ Word16 getTcxonly_fx( 
    const Word16 is_ism_format /* i  : flag indicating ISM format           Q0*/

)

#else

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

 * getTcxonly_ivas()

 *

 *

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



Word16 getTcxonly_ivas_fx(

    const Word16 element_mode, /* i  : IVAS element mode                    Q0*/

    const Word32 total_brate,  /* i  : total bitrate                        Q0*/
@@ -245,6 +250,7 @@ Word16 getTcxonly_ivas_fx( 


    return tcxonly; /*Q0*/

}

#ifndef FIX_2385_GETTCXONLY



Word16 getTcxonly(

    const Word32 total_brate /* i  : total bitrate                       */
@@ -262,7 +268,6 @@ Word16 getTcxonly( 
    return tcxonly; /*Q0*/

}



#ifndef FIX_2385_GETTCXONLY

Word16 getTcxonly_fx(

    const Word16 element_mode, /* i  : IVAS element mode                    Q0*/

    const Word32 total_brate,  /* i  : total bitrate                        Q0*/

lib_com/prot_fx.h

+4 −0
Original line number Diff line number Diff line
@@ -3856,10 +3856,12 @@ Word16 get_cng_mode( 
Word16 get_codec_mode(

    const Word32 total_brate /* i  : total bitrate   */

);

#ifndef FIX_2385_GETTCXONLY















Word16 getTcxonly(















    const Word32 total_brate /* i  : total bitrate                       */















);













#endif





























Word16 getTcxonly_fx(















    const Word16 element_mode, /* i  : IVAS element mode                   */










@@ -10438,6 +10440,7 @@ void configureFdCngEnc_ivas_fx(













    const Word16 bwidth,         /* Q0 */















    const Word32 total_brate     /* Q0 */















);













#ifndef FIX_2385_GETTCXONLY





























Word16 getTcxonly_ivas_fx(















    const Word16 element_mode, /* i  : IVAS element mode                   */









@@ -10445,6 +10448,7 @@ Word16 getTcxonly_ivas_fx(













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















    const Word16 is_ism_format /* i  : flag indicating ISM format          */















);













#endif





























void SetModeIndex_ivas_fx(















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

































lib_dec/core_dec_init_fx.c



+11
−0




























Original line number
Diff line number
Diff line








@@ -32,6 +32,12 @@ void open_decoder_LPD_fx(













    TCX_LTP_DEC_HANDLE hTcxLtpDec;















    HQ_DEC_HANDLE hHQ_core;















    TCX_DEC_HANDLE hTcxDec;













#ifdef FIX_2385_GETTCXONLY













    Word16 MCT_flag;



























    MCT_flag = 0; /* TODO: workaround for future harmonization of functions */













    move16();













#endif































    hBPF = st->hBPF;















    hBWE_TD = st->hBWE_TD;










@@ -67,10 +73,15 @@ void open_decoder_LPD_fx(













        st->L_frameTCX_past = hTcxDec->L_frameTCX;















        move16();















    }



























#ifdef FIX_2385_GETTCXONLY













    st->tcxonly = getTcxonly_fx( st->element_mode, total_brate, MCT_flag, st->is_ism_format );













#else















    st->tcxonly = getTcxonly(















        st->total_brate















        /*, st->is_ism_format Needed in the last version of float IVAS */















    );













#endif















    move16();































    /* the TD TCX PLC in MODE1 still runs with 80ms subframes */

































lib_dec/evs_dec_fx.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -245,7 +245,11 @@ ivas_error evs_dec_fx(













    test();















    test();















    test();













#ifdef FIX_2385_GETTCXONLY













    IF( st_fx->use_partial_copy && ( ( sub( st_fx->last_core, HQ_CORE ) == 0 ) || ( sub( st_fx->last_core, TCX_10_CORE ) == 0 ) || ( ( sub( st_fx->last_core, TCX_20_CORE ) == 0 ) && getTcxonly_fx( EVS_MONO, st_fx->last_total_brate, 0, 0 ) ) ) )













#else















    IF( st_fx->use_partial_copy && ( ( sub( st_fx->last_core, HQ_CORE ) == 0 ) || ( sub( st_fx->last_core, TCX_10_CORE ) == 0 ) || ( ( sub( st_fx->last_core, TCX_20_CORE ) == 0 ) && getTcxonly( /*EVS_MONO, */ st_fx->last_total_brate /*, 0, 0*/ ) ) ) )













#endif















    {















        st_fx->bfi = 1;















        move16();

































lib_enc/core_enc_init_fx.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -49,8 +49,12 @@ void init_coder_ace_plus_fx(













    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;































    /* Bitrate */













#ifdef FIX_2385_GETTCXONLY













    st->tcxonly = (Word8) getTcxonly_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );













#else















    st->tcxonly = (Word8) getTcxonly(















        st->total_brate );













#endif















    move16();































    /* Core Sampling Rate */