Commit e9edc1c0 authored by multrus's avatar multrus
Browse files

fix compilation warnings

parent c38ace99

lib_enc/igf_enc_fx.c

100644 → 100755
+4 −6
Original line number Diff line number Diff line
@@ -366,11 +366,7 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou 
    Word16 i;

    Word16 igfBgn;

    Word16 igfEnd;

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

    Word32 highPassEner; /* Q31 */

#else

    Word64 highPassEner;

#endif

    Word32 lastLine;

    Word32 nextLine;

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
@@ -432,6 +428,8 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou 
    {

#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW

        L_c = 0;

#else

        Word64 W_accum = 0;

#endif

        move32();

        FOR( i = 0; i < igfBgn; i++ )
@@ -445,14 +443,14 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou 
            L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );

#else

            move32();

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

            W_accum = W_add( W_accum, 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( highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/

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

#endif

        *highPassEner_exp = add( *highPassEner_exp, pPowerSpectrum_exp );

        move16();