Commit 69592909 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

renamed getTcxonly_ivas_fx() to getTcxonly_fx()

parent 79179b4d

lib_com/core_com_config_fx.c

+9 −0
Original line number Diff line number Diff line
@@ -176,12 +176,21 @@ Word16 get_codec_mode( 
 *

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



#ifdef FIX_2385_GETTCXONLY

Word16 getTcxonly_fx(

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

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

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

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

)

#else

Word16 getTcxonly_ivas_fx(

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

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

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

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

)

#endif /* FIX_2385_GETTCXONLY */

{

    Word16 tcxonly = 0;

    move16();

lib_dec/core_dec_init_fx.c

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

    }



#ifdef FIX_2385_GETTCXONLY

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

#else

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

#endif

    move16();



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

lib_dec/ivas_tcx_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -119,11 +119,7 @@ void stereo_tcx_init_dec_fx( 


    IF( EQ_16( st->element_mode, IVAS_SCE ) )

    {

#ifdef FIX_2385_GETTCXONLY

        st->tcxonly = getTcxonly_ivas_fx( st->element_mode, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), MCT_flag, st->is_ism_format ); /* Q0 */

#else

        st->tcxonly = getTcxonly_fx( st->element_mode, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), MCT_flag, st->is_ism_format ); /* Q0 */

#endif /* FIX_2385_GETTCXONLY */

        move16();



        /* LPC quantization */

lib_enc/core_enc_init_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -941,7 +941,11 @@ void init_coder_ace_plus_ivas_fx( 
    Word16 L_subfr;



    /* Bitrate */

#ifdef FIX_2385_GETTCXONLY

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

#else

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

#endif /* FIX_2385_GETTCXONLY */

    move16();



    /* Core Sampling Rate */

lib_enc/core_enc_switch_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -255,11 +255,7 @@ void core_coder_mode_switch_ivas_fx( 
        move16();

    }



#ifdef FIX_2385_GETTCXONLY

    tcxonly_tmp = getTcxonly_ivas_fx( st->element_mode, st->total_brate, MCT_flag, st->is_ism_format );

#else

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

#endif /* FIX_2385_GETTCXONLY */



    if ( NE_32( tcxonly_tmp, st->tcxonly ) )

    {
@@ -275,11 +271,7 @@ void core_coder_mode_switch_ivas_fx( 
        move16();

        st->L_frame = extract_l( Mpy_32_32_r( sr_core, ONE_BY_FRAMES_PER_SEC_Q31 ) );



#ifdef FIX_2385_GETTCXONLY

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

#else

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

#endif /* FIX_2385_GETTCXONLY */

        move16();



        Word16 exp_tmp1 = 0;