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

fully harmonize

parent 65fb27eb

lib_enc/fd_cng_enc_fx.c

+5 −14
Original line number Diff line number Diff line
@@ -1338,18 +1338,16 @@ Word16 cng_energy_ivas_fx( 
#ifdef HARMONIZE_2539_cng_energy

    Word16 scale_tmp;

    Word32 scale_tmp32;



    scale_tmp = sub( scale, 4 );

    scale_tmp32 = 0x80000000;

    move32();

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        scale_tmp = scale;

        move16();

        scale_tmp32 = L_shr( 0x40000000, 7 - 1 );

    }

    ELSE

    {

        scale_tmp = sub( scale, 4 );

        scale_tmp32 = 0x80000000;

        move32();

    }

#endif



    IF( EQ_16( len, L_FRAME ) )
@@ -1361,14 +1359,7 @@ Word16 cng_energy_ivas_fx( 
            L_tmp = L_mult0( tmp16, tmp16 );

            pt_res++;

            tmp16 = shl( *pt_res, scale_tmp );

            IF( EQ_16( element_mode, EVS_MONO ) )

            {

                L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 );

            }

            ELSE

            {

            L_tmp = L_mac0_sat( 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