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

try to obtain allgreen-code for ivas path

parent 7636edba

lib_enc/fd_cng_enc_fx.c

+7 −12
Original line number Diff line number Diff line
@@ -1364,11 +1364,14 @@ Word16 cng_energy_ivas_fx( 
            L_tmp = L_mult0( tmp16, tmp16 );

            pt_res++;

            tmp16 = shl( *pt_res, scale_tmp );

            L_tmp = L_mac0( L_tmp, tmp16, tmp16 );

            if ( EQ_16( element_mode, EVS_MONO ) )

            IF ( EQ_16( element_mode, EVS_MONO ) )

            {

                L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 );

            }

            ELSE

            {

                L_tmp = L_mac0( L_tmp, tmp16, tmp16 );

            }

            pt_res++;

            W_ener = W_msu0_32_32( W_ener, L_tmp, scale_tmp32 ); /* 2*(Q_new+scale)+1, divide by L_frame done here */

#else
@@ -1388,18 +1391,10 @@ Word16 cng_energy_ivas_fx( 
        {

#ifdef HARMONIZE_2539_cng_energy

            tmp16 = shl( *pt_res, scale_tmp );

            L_tmp = L_mult( tmp16, tmp16 );

            if ( EQ_16( element_mode, EVS_MONO ) )

            {

            L_tmp = L_mult0( tmp16, tmp16 );

            }

            pt_res++;

            tmp16 = shl( *pt_res, scale_tmp );

            L_tmp = L_mac( L_tmp, tmp16, tmp16 ); /* 2*(Q_new+scale) - 7 */

            if ( EQ_16( element_mode, EVS_MONO ) )

            {

            L_tmp = L_mac0_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