Commit a545be65 authored by Michael Sturm's avatar Michael Sturm
Browse files

Fixes compile error & minor cleanup.

parent 35daafde

lib_enc/igf_enc_fx.c

+7 −11
Original line number Diff line number Diff line
@@ -2064,7 +2064,6 @@ static void IGF_CalculateEnvelope_ivas_fx( 
    Word16 tmp_e;

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS_2

    Word32 LFMDCTSpectrum[N_MAX];

    Word32 LFPowerSpectrum[N_MAX];

    Word16 sfbEnergyTileR16;

    Word16 sfbEnergyR16;

    Word16 gain16;  /* the EVS gain which has to be applied to the source tile to get the destination energy */
@@ -2076,6 +2075,10 @@ static void IGF_CalculateEnvelope_ivas_fx( 
    swb_offset = hGrid->swb_offset;

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS_2

    zeroNrg = 0;

    sfbEnergyTileR16 = 0;

    temp = 0;

    move16();

    move16();

    move16();

#endif
@@ -2128,8 +2131,6 @@ static void IGF_CalculateEnvelope_ivas_fx( 
                    {

                        LFMDCTSpectrum[sb] = pMDCTSpectrum_fx[strt_cpy];

                        move32();

                        LFPowerSpectrum[sb] = pPowerSpectrum_fx[strt_cpy];

                        move32();

                        strt_cpy = add( strt_cpy, 1 );

                    }

                }
@@ -2234,15 +2235,14 @@ static void IGF_CalculateEnvelope_ivas_fx( 
                    move32();

                    sfbEnergyTileR_e = add( sfbEnergyTileR_e, tmp32_e );

                    move16();



                    BASOP_Util_Divide_MantExp( round_fx_sat( sfbEnergyTileR ), sfbEnergyTileR_e, width, 15, &sfbEnergyTileR16, &sfbEnergyTileR_e );

                    IF( sfbEnergyTileR16 == 0 )

                    IF( sfbEnergyTileR == 0 )

                    {

                        sfbEnergyTileR16 = 0x00010000;

                        sfbEnergyTileR = 0x00010000;

                        sfbEnergyTileR_e = 0;

                        move16();

                        move16();

                    }

                    BASOP_Util_Divide_MantExp( round_fx_sat( sfbEnergyTileR ), sfbEnergyTileR_e, width, 15, &sfbEnergyTileR16, &sfbEnergyTileR_e );



                    strt_cpy += swb_offset[sfb + 1] - swb_offset[sfb];

                }
@@ -2250,11 +2250,7 @@ static void IGF_CalculateEnvelope_ivas_fx( 


                IF( sfbEnergyTileR == 0 )

                {

#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS_2

                    sfbEnergyTileR = ( element_mode > EVS_MONO ) ? EPSILON_FX : 0x00010000;

#else

                    sfbEnergyTileR = EPSILON_FX;

#endif

                    sfbEnergyTileR_e = 0;

                    move32();

                    move16();