Commit 9dabb55a authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1277_fix' into 'main' 

Fix for 3GPP issue 1277: Stereo CNG during high level mixed music

See merge request !1126
parents 5a64da3f 4446c32f

lib_enc/nois_est_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ void noise_est_ivas_fx( 
    lim_Etot_fx = s_max( 5120, Etot );                                              /* 20.0f Q8 */

    lim_Etot_sq_fx = extract_h( L_shl_r( L_mult( lim_Etot_fx, lim_Etot_fx ), 1 ) ); /* Q2 */



    IF( LT_16( st_fx->ini_frame, 150 ) )

    IF( LT_16( ini_frame, 150 ) )

    {

        /* Allow use of quicker filter during init - if needed */

        /* st->Etot_st_est = 0.25f * lim_Etot + (1.0f-0.25F) * st->Etot_st_est; */
@@ -2848,7 +2848,7 @@ void noise_est_ivas_fx( 
    test();

    test();

    if ( ( GT_16( *st_harm_cor_cnt, 1 ) ) && ( ( LT_16( Etot, 3840 /* 15 in Q8 */ ) ) ||

                                               ( GT_16( st_fx->ini_frame, 10 ) &&

                                               ( GT_16( ini_frame, 10 ) &&

                                                 GT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) ) ) )

    {

        *st_harm_cor_cnt = 1;
@@ -3113,7 +3113,7 @@ void noise_est_ivas_fx( 
    test();

    test();

    IF( ( ( LT_16( *st_harm_cor_cnt, ( 3 * HC_CNT_SLOW_FX ) ) ) && ( ( GT_32( non_sta, th_sta ) ) || ( LT_16( tmp_pc, TH_PC_FX ) ) || ( noise_char > 0 ) ) ) ||

        ( ( GT_16( st_fx->ini_frame, HE_LT_CNT_INIT_FX ) ) && ( GT_16( sub( Etot, Etot_l_lp ), 2560 ) ) ) ||

        ( ( GT_16( ini_frame, HE_LT_CNT_INIT_FX ) ) && ( GT_16( sub( Etot, Etot_l_lp ), 2560 ) ) ) ||

        ( GT_16( cor_tmp, cor_max ) ) || /* Q15 */

        ( GT_32( LepsP, th_eps ) ) ||    /* Q11 */

        ( GT_16( *loc_harm, 0 ) ) ||
@@ -3419,7 +3419,7 @@ void noise_est_ivas_fx( 
    test();

    test();

    test();

    if ( LT_16( st_fx->ini_frame, HE_LT_CNT_INIT_FX ) && GT_16( hNoiseEst->harm_cor_cnt, 5 ) && LT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) &&

    if ( LT_16( ini_frame, HE_LT_CNT_INIT_FX ) && GT_16( hNoiseEst->harm_cor_cnt, 5 ) && LT_16( sub( Etot, hNoiseEst->Etot_lp_fx ), 1792 /* 7 in Q8 */ ) &&

         ( ( LT_16( hNoiseEst->act_pred_fx, 19333 /* 0.59 in Q15 */ ) && LT_16( hNoiseEst->lt_haco_ev_fx, 7537 /* 0.23 in Q15 */ ) ) || LT_16( hNoiseEst->act_pred_fx, 12452 /* 0.38 in Q15 */ ) ||

           ( ( ( st_fx->element_mode == EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 4915 /* 0.15 in Q15 */ ) ) || ( ( st_fx->element_mode > EVS_MONO ) && LT_16( hNoiseEst->lt_haco_ev_fx, 2621 /* 0.08 in Q15 */ ) ) ) ||

           LT_16( non_staB, 50 * 256 /* 50 in Q8 */ ) || ( aE_bgd != 0 ) || ( LT_16( Etot, 10752 /* 42.0 in Q8 */ ) && GT_16( hNoiseEst->harm_cor_cnt, 10 ) && LT_16( hNoiseEst->lt_haco_ev_fx, 11469 /* 0.35 in Q8 */ ) && LT_16( hNoiseEst->act_pred_fx, 26214 /* 0.8 in Q8 */ ) ) ) )