Commit 54b8e260 authored by vaclav's avatar vaclav
Browse files

two fixes to restore BE

parent c074f054

lib_enc/cng_enc_fx.c

+9 −30
Original line number Diff line number Diff line
@@ -1303,6 +1303,8 @@ void CNG_enc_fx( 
            }

        }

        ELSE /* L_FRAME16k */

        {

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

            {

                FOR( j = 0; j < 80; j++ )

                {
@@ -1314,6 +1316,7 @@ void CNG_enc_fx( 
                }

            }

        }

    }

    ELSE

#endif

    {
@@ -1690,36 +1693,12 @@ 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 );

            }

            ELSE

            {

                L_tmp1 = 0;

                move16();

            }

#else

            /**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*/

#endif



            test();

            test();

#ifdef HARM_NON_LINEARITY

            IF( ( hDtxEnc->first_CNG > 0 || ( st_fx->element_mode == EVS_MONO ) ) && L_tmp1 > 0 )

#else

            IF( ( hDtxEnc->first_CNG > 0 || ( st_fx->element_mode == EVS_MONO ) ) && w_temp > 0 )

#endif

            {

                *allow_cn_step = s_or( *allow_cn_step, 1 );

                move16();