Commit ebf3b995 authored by vaclav's avatar vaclav
Browse files

revert a change in CNG_enc_fx()

parent 8affe9ca
Loading
Loading
Loading
Loading
Loading
+20 −2
Original line number Diff line number Diff line
@@ -1693,8 +1693,26 @@ void CNG_enc_fx(

        IF( hTdCngEnc->burst_ho_cnt > 0 )
        {
#ifdef HARM_NON_LINEARITY
            IF( st_fx->element_mode == EVS_MONO )
            {
                /**allow_cn_step |= ( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr] > 4 * hTdCngEnc->lp_ener_fx ); */
                /*allow_cn_step |= (hDtxEnc->first_CNG || st->element_mode == EVS_MONO) && (hTdCngEnc->ho_ener_hist[hTdCngEnc->ho_hist_ptr] > lp_ener_thr_scale * hTdCngEnc->lp_ener);*/
                /* (hTdCngEnc->ho_ener_hist[hTdCngEnc->ho_hist_ptr] > lp_ener_thr_scale * hTdCngEnc->lp_ener); */
                L_tmp1 = L_shr( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr], 2 );
                IF( NE_16( lp_ener_thr_scale, 8 ) )
                {
                    L_tmp1 = L_add( L_tmp1, L_shr( hTdCngEnc->lp_ener_fx, 8 ) );
                }
                L_tmp1 = L_sub( L_tmp1, hTdCngEnc->lp_ener_fx );
                w_temp = W_deposit32_l( L_tmp1 );
            }
            ELSE
#endif
            {
                /**allow_cn_step |= ( hDtxEnc->first_CNG || st->element_mode == EVS_MONO ) && ( hTdCngEnc->ho_ener_hist[hTdCngEnc->ho_hist_ptr] > lp_ener_thr_scale * hTdCngEnc->lp_ener );*/
                w_temp = W_msu_32_16( W_shl( W_deposit32_l( hTdCngEnc->ho_ener_hist_fx[hTdCngEnc->ho_hist_ptr] ), 2 ), hTdCngEnc->lp_ener_fx, lp_ener_thr_scale ); /*Q8*/
            }

            test();
            test();