Commit 77a71a49 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

harmonize ivas-path further

parent e45228d2

lib_enc/fd_cng_enc_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -1358,10 +1358,18 @@ Word16 cng_energy_ivas_fx( 
        FOR( i = 0; i < 160; i++ )

        {

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

#ifdef HARMONIZE_2539_cng_energy

            L_tmp = L_mult0( tmp16, tmp16 );

#else

            L_tmp = L_mult( tmp16, tmp16 );

#endif

            pt_res++;

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

#ifdef HARMONIZE_2539_cng_energy

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

#else

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

#endif

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0
@@ -1375,6 +1383,10 @@ Word16 cng_energy_ivas_fx( 
#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0

    L_ener = L_shl( W_extract_h( W_neg( W_ener ) ), 1 );

    if( NE_16( len, L_FRAME ) )

    {

        L_ener = L_shl( L_ener, 1 );

    }

#endif

#endif

    hi = norm_l( L_ener );