Commit 668e23d9 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1487_fix' into 'main' 

[allow regression] Fix for 3GPP issue 1487: Basop Encoder: Stereo DTX Front VAD Flag Mismatch

See merge request !1451
parents be720a16 349ac688

lib_enc/nois_est_fx.c

+7 −6
Original line number Diff line number Diff line
@@ -2254,6 +2254,7 @@ void noise_est_ivas_fx( 
    Word16 tmp_enr, tmp_floor; /* constants in Q8 */

    Word16 vad_bwidth_fx;      /* vad ns  control variabel for input bwidth from teh BWD  */

    /* for DTX operation */

    Word32 L_tmp;



    Word16 lim_Etot_fx;    /* Q8 */

    Word32 lim_Etot_sq_fx; /* Q16 */
@@ -3002,7 +3003,7 @@ void noise_est_ivas_fx( 
    } */

    IF( *st_harm_cor_cnt == 0 )

    {

        hNoiseEst->lt_haco_ev_fx = mac_r( 64424509 /* 0.03 in Q32*/, hNoiseEst->lt_haco_ev_fx, 31785 /* 0.97 in Q15*/ ); // Q15

        hNoiseEst->lt_haco_ev_fx = mac_r( 64424509 /* 0.03 in Q31*/, hNoiseEst->lt_haco_ev_fx, 31785 /* 0.97 in Q15*/ ); // Q15

        move16();

    }

    ELSE
@@ -3559,14 +3560,14 @@ void noise_est_ivas_fx( 
    }

    /*st->lt_aEn_zero = 0.2f * (st->aEn==0) + (1-0.2f)  *st->lt_aEn_zero;*/

    /*  y(n+1)=        alpha*tmp            + (1-alpha)*y(n)           */

    tmp = 0;

    move16();

    L_tmp = 0;

    move32();

    if ( hNoiseEst->aEn == 0 )

    {

        tmp = 6554; // 0.2 in Q15

        move16();

        L_tmp = 429496730; // 0.2 in Q31

        move32();

    }

    hNoiseEst->lt_aEn_zero_fx = mac_r( tmp, hNoiseEst->lt_aEn_zero_fx, 26214 /* 0.8 in Q15*/ ); // Q15

    hNoiseEst->lt_aEn_zero_fx = mac_r( L_tmp, hNoiseEst->lt_aEn_zero_fx, 26214 /* 0.8 in Q15*/ ); // Q15

    move16();



    IF( st_fx->element_mode > EVS_MONO )