Commit cdd4cc7e authored by Fabian Bauer's avatar Fabian Bauer
Browse files

use swb_bwe_enc_fx from 9b193cb8, deactivate file from second half of EstimateSHBFrameGain_ivas_fx()

parent 40eac3fd

lib_enc/swb_tbe_enc_fx.c

+8 −12
Original line number Diff line number Diff line
@@ -4828,9 +4828,6 @@ static void EstimateSHBFrameGain_fx( 
    return;

}



#ifdef ISSUE_1867_replace_overflow_libenc

#undef ISSUE_1867_replace_overflow_libenc

#endif



static void EstimateSHBFrameGain_ivas_fx(

    const Word16 length,            /* i : SHB overlap length                                                  */
@@ -4856,12 +4853,7 @@ static void EstimateSHBFrameGain_ivas_fx( 
    Word16 exp_out;

    Word16 tmp;

    Word16 scaling = 0;

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();

#endif

#endif



    move16();



    /* initilaization */
@@ -4971,7 +4963,7 @@ static void EstimateSHBFrameGain_ivas_fx( 


    FOR( i = 0; i < l_shb_lahead; i++ )

    {

#ifdef ISSUE_1867_replace_overflow_libenc

#ifdef ISSUE_1867_replace_overflow_libenc_

        sig = mult_r_sat( oriSHB[i], win_shb[i] ); /* Q_oriSHB */                 //??sat

        oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_orisHB*/                  //??sat

        sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[i] ) ); /*Q_synSHB */ //??sat
@@ -4986,7 +4978,7 @@ static void EstimateSHBFrameGain_ivas_fx( 


    FOR( ; i < l_frame; i++ )

    {

#ifdef ISSUE_1867_replace_overflow_libenc

#ifdef ISSUE_1867_replace_overflow_libenc_

        oriNrg = L_mac0_sat( oriNrg, oriSHB[i], oriSHB[i] ); /* 2*Q_oriSHB */ //??sat

        sig = round_fx_sat( mod_syn[i] ); /* Q_oriSHB */                      //??sat

        synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_oriSHB - 2*/          //??sat
@@ -5000,7 +4992,7 @@ static void EstimateSHBFrameGain_ivas_fx( 
    tmp = add( l_frame, l_shb_lahead );

    FOR( ; i < tmp; i++ )

    {

#ifdef ISSUE_1867_replace_overflow_libenc

#ifdef ISSUE_1867_replace_overflow_libenc_

        sig = mult_r_sat( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i] ); /* Q_oriSHB */                  //??sat

        oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB */                                               //??sat

        sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ) ); /* Q_oriSHB */ //??sat
@@ -5058,6 +5050,10 @@ static void EstimateSHBFrameGain_ivas_fx( 
    return;

}



#ifdef ISSUE_1867_replace_overflow_libenc

#undef ISSUE_1867_replace_overflow_libenc

#endif



static Word32 pow_off_pk_fx( Word16 a[], Word16 len, Word16 step )

{

    Word16 i, j;