Commit 9add17a5 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fix ivas-path, set evs path to msu

parent a6f3a2eb

lib_enc/fd_cng_enc_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ Word16 cng_energy_fx( 
    const Word16 *pt_res;

    Word32 L_ener, L_tmp;

#ifdef HARMONIZE_2539_cng_energy

    Word64 W_ener = W_deposit32_h( 1 );

    Word64 W_ener = W_neg( W_deposit32_h( 1 ) );

    move64();

#endif
@@ -1210,7 +1210,7 @@ Word16 cng_energy_fx( 
            L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 ); /* 2*(Q_new+scale) */

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

            W_ener = W_mac_32_32( W_ener, L_tmp, L_shr( 0x40000000, 7 - 1 ) ); /* 2*(Q_new+scale)+1, divide by L_frame done here */

            W_ener = W_msu0_32_32( W_ener, L_tmp, L_shr( 0x40000000, 7 - 1 ) ); /* 2*(Q_new+scale)+1, divide by L_frame done here */

#else

            L_ener = L_add( L_ener, L_shr( L_tmp, 7 ) ); /* 2*(Q_new+scale)+1, divide by L_frame done here */

#endif
@@ -1227,14 +1227,14 @@ Word16 cng_energy_fx( 
            L_tmp = L_mac0_sat( L_tmp, tmp16, tmp16 ); /* 2*(Q_new+scale) */

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

            W_ener = W_mac_32_32( W_ener, Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), L_shr( 0x40000000, 7 - 1 ) ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */

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

#else

            L_ener = L_add( L_ener, L_shr( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* 2*(Q_new+scale)+15+1-16+1, divide by L_frame done here */

#endif

        }

    }

#ifdef HARMONIZE_2539_cng_energy

    L_ener = W_extract_h( W_ener );

    L_ener = L_negate( W_extract_h( W_ener ) );

#endif

    hi = norm_l( L_ener );

    lo = Log2_norm_lc( L_shl( L_ener, hi ) );
@@ -1337,7 +1337,7 @@ Word16 cng_energy_ivas_fx( 
            L_tmp = L_mac( L_tmp, tmp16, tmp16 );    /* 2*(Q_new+scale) - 7 */

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

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

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

#else

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

#endif