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

Revert "fix ivas path" 

This reverts commit 6c94c2da.
parent 91857e0c

lib_enc/fd_cng_enc_fx.c

+10 −23
Original line number Diff line number Diff line
@@ -1361,24 +1361,9 @@ Word16 cng_energy_ivas_fx( 
        }

    }

    ELSE /* L_FRAME16k */

    {

#ifdef HARMONIZE_2539_cng_energy

        IF ( NE_16( element_mode, EVS_MONO ) )

        {

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

            {

                tmp16 = shl( *pt_res, scale_tmp );

                L_tmp = L_mult( tmp16, tmp16 );

                pt_res++;

                tmp16 = shl( *pt_res, scale_tmp );

                L_tmp = L_mac_sat( L_tmp, tmp16, tmp16 );

                pt_res++;

                W_ener = W_msu0_32_32( W_ener, Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), scale_tmp32 ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */

            }

        }

        ELSE

    {

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

#ifdef HARMONIZE_2539_cng_energy

        {

            tmp16 = shl( *pt_res, scale_tmp );

            L_tmp = L_mult0( tmp16, tmp16 );
@@ -1388,9 +1373,11 @@ Word16 cng_energy_ivas_fx( 
            pt_res++;

            W_ener = W_msu0_32_32( W_ener, Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), scale_tmp32 ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */

        }

        if ( NE_16( element_mode, EVS_MONO ) )

        {

            W_ener = W_shl( W_ener, 1 );

        }

#else

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

        {

            tmp16 = shl( *pt_res, sub( scale, 4 ) ); // Q_new + scale - 4

            L_tmp = L_mult( tmp16, tmp16 );