Commit 28f05615 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fix presumed bug in energy calc

parent 338a470b

lib_enc/fd_cng_enc_fx.c

+1 −27
Original line number Diff line number Diff line
@@ -1215,12 +1215,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

#ifdef HARMONIZE_2539_cng_energy_msu0

            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 */

#endif

#ifdef HARMONIZE_2539_cng_energy_mac

            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 */

#endif

#else

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

#endif
@@ -1237,24 +1232,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

#ifdef HARMONIZE_2539_cng_energy_msu0

            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 */

#endif

#ifdef HARMONIZE_2539_cng_energy_mac

            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 */

#endif

#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

#ifdef HARMONIZE_2539_cng_energy_msu0

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

#endif

#ifdef HARMONIZE_2539_cng_energy_mac

    L_ener = W_extract_h( W_ener );

#endif

#endif

    hi = norm_l( L_ener );

    lo = Log2_norm_lc( L_shl( L_ener, hi ) );
@@ -1316,12 +1301,7 @@ Word16 cng_energy_ivas_fx( 
    const Word16 *pt_res;

    Word32 L_ener, L_tmp;

#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0

    Word64 W_ener = W_shr( W_deposit32_h( 1 ), 1 );

#endif

#ifdef HARMONIZE_2539_cng_energy_mac

    Word64 W_ener = W_deposit32_h( 1 );

#endif

    move64();

#endif
@@ -1345,9 +1325,7 @@ Word16 cng_energy_ivas_fx( 
            L_tmp = L_mac0( L_tmp, tmp16, tmp16 );   /* 2*(Q_new+scale) + 7 */

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0

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

#endif

#else

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

#endif
@@ -1372,22 +1350,18 @@ Word16 cng_energy_ivas_fx( 
#endif

            pt_res++;

#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0

            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 */

#endif

#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

        }

    }

#ifdef HARMONIZE_2539_cng_energy

#ifdef HARMONIZE_2539_cng_energy_msu0

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

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

    if ( NE_16( len, L_FRAME ) )

    {

        L_ener = L_shl( L_ener, 1 );

    }

#endif

#endif

    hi = norm_l( L_ener );

    lo = Log2_norm_lc( L_shl( L_ener, hi ) );