Commit a987bf13 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

issue _1965_ fix

parent 81529013

lib_enc/igf_enc_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -428,10 +428,11 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou 
    {

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

        L_c = 0;

        move32();

#else

        Word64 W_accum = 0;

        Word64 W_highPassEner = 0;

        move64();

#endif

        move32();

        FOR( i = 0; i < igfBgn; i++ )

        {

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
@@ -442,15 +443,14 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou 
            move32();

            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );

#else

            move32();

            W_accum = W_add( W_accum, Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) /*Q20, pPowerSpectrum_exp*/ );

            W_highPassEner = W_add( W_highPassEner, W_deposit32_l( Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) ) /*Q20, pPowerSpectrum_exp*/ );

#endif

        }



#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

        highPassEner = norm_llQ31( L_c, highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/

#else

        highPassEner = w_norm_llQ31( W_accum, highPassEner_exp ); /*Q20, highPassEner_exp*/

        highPassEner = w_norm_llQ31( W_highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/

#endif

        *highPassEner_exp = add( *highPassEner_exp, pPowerSpectrum_exp );

        move16();
@@ -969,7 +969,7 @@ Word16 IGF_getSFM( /**< out: Q15| SFM value 
        move32();

        L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );

#else

        W_denom = W_add( energy[i], W_denom );

        W_denom = W_add( W_deposit32_l( energy[i] ), W_denom );

#endif

    }