Commit 5fcab102 authored by multrus's avatar multrus
Browse files

few simplifications

parent 9692a5a2

lib_dec/dec_tcx_fx.c

+15 −25
Original line number Diff line number Diff line
@@ -1547,6 +1547,9 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
    Word16 tmp1, tmp2, s;

    Word32 tmp32;

    Word32 tmp32_1, tmp32_2;

#ifdef HARMONIZE_2604_decoder_tcx_post

    Word16 tcxltp_last_gain_unmodified_tmp;

#endif

    TCX_DEC_HANDLE hTcxDec;



    hTcxDec = st_fx->hTcxDec;
@@ -1648,11 +1651,7 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
    test();

    test();

    test();

#ifdef HARMONIZE_2604_decoder_tcx_post

    IF( bfi == 0 && st_fx->tcxonly != 0 && ( ( GT_16( st_fx->element_mode, EVS_MONO ) && ( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) || MCT_flag ) ) || EQ_16( st_fx->element_mode, EVS_MONO ) ) && EQ_16( st_fx->clas_dec, UNVOICED_CLAS ) )

#else

    IF( bfi == 0 && st_fx->tcxonly != 0 && ( NE_16( st_fx->element_mode, IVAS_CPE_MDCT ) || MCT_flag ) && EQ_16( st_fx->clas_dec, UNVOICED_CLAS ) )

#endif

    {



        Word16 Qnew_levelBackgroundTrace;
@@ -1749,10 +1748,6 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
                    &gainCNG,

                    &gainCNG_e );

            }

#ifdef HARMONIZE_2604_decoder_tcx_post

            IF( GT_16( st_fx->element_mode, EVS_MONO ) )

            {

#endif

            test();

            IF( EQ_16( st_fx->element_mode, IVAS_CPE_MDCT ) && !MCT_flag )

            {
@@ -1768,9 +1763,6 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
                    gainCNG = extract_l( Mpy_32_32( gainCNG, tmp32 ) );

                }

            }

#ifdef HARMONIZE_2604_decoder_tcx_post

            }

#endif

        }

        ELSE

        {
@@ -1870,8 +1862,6 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
        ELSE

        {

#endif





            IF( ( EQ_16( st_fx->nbLostCmpt, 1 ) ) )

            {

                hTcxDec->conceal_eof_gain32 = ONE_IN_Q30 /*1.0f Q30*/;
@@ -1972,7 +1962,7 @@ void decoder_tcx_post_ivas_fx( Decoder_State *st_fx, 
    move16();



#ifdef HARMONIZE_2604_decoder_tcx_post

    Word16 tcxltp_last_gain_unmodified_tmp = hTcxDec->tcxltp_last_gain_unmodified;

    tcxltp_last_gain_unmodified_tmp = hTcxDec->tcxltp_last_gain_unmodified;

    if ( GT_16( st_fx->element_mode, EVS_MONO ) )

    {

        tcxltp_last_gain_unmodified_tmp = shr( tcxltp_last_gain_unmodified_tmp, 1 );