Commit 961bd058 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

removed unused variable

parent d1e6474d

lib_dec/ivas_out_setup_conversion_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
    Word16 frameSize;

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    Word64 targetEnergy64[MAX_SFB + 2], dmxEnergy64[MAX_SFB + 2];

    Word16 dmxEnergy_exp[MAX_SFB + 2], dmxEnergy_exp_temp, sf1, sf2;

    Word16 dmxEnergy_exp_temp, scf1, scf2;

#else

    Word32 targetEnergy[MAX_SFB + 2], dmxEnergy[MAX_SFB + 2];

    Word16 dmxEnergy_exp[MAX_SFB + 2], dmxEnergy_exp_temp;
@@ -756,8 +756,8 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    set64_fx( targetEnergy64, 0, MAX_SFB + 2 );

    set64_fx( dmxEnergy64, 0, MAX_SFB + 2 );

    sf1 = 63;

    sf2 = 63;

    scf1 = 63;

    scf2 = 63;

    move16();

    move16();

#else
@@ -863,7 +863,7 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                        }

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                        targetEnergy64[bandIdx] = W_add( targetEnergy64[bandIdx], W_shr( targetEne64, 1 ) );

                        sf1 = s_min( sf1, W_norm( targetEnergy64[bandIdx] ) );

                        scf1 = s_min( scf1, W_norm( targetEnergy64[bandIdx] ) );

#else

                        targetEnergy[bandIdx] = L_add( targetEnergy[bandIdx], targetEne );

                        move32();
@@ -913,7 +913,7 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
            }

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

            dmxEnergy64[bandIdx] = W_add( dmxEnergy64[bandIdx], W_shr( DMXEne64, 1 ) );

            sf2 = s_min( sf2, W_norm( dmxEnergy64[bandIdx] ) );

            scf2 = s_min( scf2, W_norm( dmxEnergy64[bandIdx] ) );

#else

            dmxEnergy[bandIdx] = BASOP_Util_Add_Mant32Exp( dmxEnergy[bandIdx], dmxEnergy_exp[bandIdx], DMXEne, DMXEne_exp, &dmxEnergy_exp[bandIdx] );

            move32();
@@ -936,9 +936,9 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
    scale_sig32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, dmx_sacle );



#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    Word16 targetEnergy_e = sub( add( sub( 40, shl( q_output, 1 ) ), 1 ), sf1 );

    Word16 targetEnergy_e = sub( add( sub( 40, shl( q_output, 1 ) ), 1 ), scf1 );

    Word16 te_max_e = s_max( targetEnergy_e, sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) );

    dmxEnergy_exp_temp = sub( add( sub( 40, shl( q_output, 1 ) ), 1 ), sf2 );

    dmxEnergy_exp_temp = sub( add( sub( 40, shl( q_output, 1 ) ), 1 ), scf2 );

#else

    Word16 te_max_e = s_max( sub( 40, shl( q_output, 1 ) ), sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) );

#endif
@@ -949,13 +949,13 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

        Word32 targetEnergy, dmxEnergy;



        targetEnergy = W_extract_h( W_shl( targetEnergy64[bandIdx], sf1 ) );

        targetEnergy = W_extract_h( W_shl( targetEnergy64[bandIdx], scf1 ) );

        targetEnergy = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( targetEnergy, sub( te_max_e, targetEnergy_e ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], sub( te_max_e, sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) ) ) ) );

        move32();

        hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx] = targetEnergy;

        move32();



        dmxEnergy = W_extract_h( W_shl( dmxEnergy64[bandIdx], sf2 ) );

        dmxEnergy = W_extract_h( W_shl( dmxEnergy64[bandIdx], scf2 ) );

        dmxEnergy = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( dmxEnergy, sub( dmx_max_e, dmxEnergy_exp_temp ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], sub( dmx_max_e, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) ) ) ) );

        move32();

        hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx] = dmxEnergy;