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

use swb_bwe_enc_fx from 9b193cb8, deactivate file from second half of... 

use swb_bwe_enc_fx from 9b193cb8, deactivate file from second half of EstimateSHBFrameGain_ivas_fx() and reactivate line 5000 and 4986 and 4971
parent c8082ab7

lib_enc/swb_tbe_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -4853,7 +4853,7 @@ static void EstimateSHBFrameGain_ivas_fx( 
    Word16 exp_out;

    Word16 tmp;

    Word16 scaling = 0;

#ifndef ISSUE_1867_replace_overflow_libenc_

#ifndef ISSUE_1867_replace_overflow_libenc

#ifdef BASOP_NOGLOB_DECLARE_LOCAL

    Flag Overflow = 0;

    move32();
@@ -4968,7 +4968,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