Commit 5591702e authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

improve precision of targetEnergy and dmxEnergy calculations in... 

improve precision of targetEnergy and dmxEnergy calculations in ivas_ls_setup_conversion_process_mdct_fx()
parent f789945a

lib_dec/ivas_out_setup_conversion_fx.c

+89 −19
Original line number Diff line number Diff line
@@ -662,8 +662,13 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
    Word16 inChannels, outChannels, num_CPE;

    Word16 transform_type[MAX_CICP_CHANNELS][2];

    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;

#else

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

    Word16 dmxEnergy_exp[MAX_SFB + 2], dmxEnergy_exp_temp;

#endif

    Word32 dmxCoeff;

    Word32 dmxSignalReal[L_FRAME48k], dmxSignalImag[L_FRAME48k];

    Word32 eqGain;
@@ -748,12 +753,20 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
    /* set overall frequency resolution of (sub)frame to maximum of (sub)frame, requires conversion if both channels are not the same */

    frameSize = hLsSetUpConversion->sfbOffset[hLsSetUpConversion->sfbCnt];

    move16();



#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;

    move16();

    move16();

#else

    set32_fx( targetEnergy, 0, MAX_SFB + 2 );

    set32_fx( dmxEnergy, 0, MAX_SFB + 2 );

    set16_fx( dmxEnergy_exp, 0, MAX_SFB + 2 );

    dmxEnergy_exp_temp = 0;

    move16();

#endif



    FOR( chOutIdx = 0; chOutIdx < outChannels; chOutIdx++ )

    {
@@ -772,8 +785,12 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                /* Step 1: Compute the target energy and DMX signal (possible since we have all signals in TCX20 resolution) */

                IF( dmxCoeff )

                {

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                    Word64 targetEne64;

                    Word32 tmpDMXSig;

#else

                    Word32 tmpDMXSig, targetEne;



#endif

                    /* Convert the signal resolution to TCX20 */

                    /* initially, set pointers to input; if conversion occurs in (sub)frame, set to convertRes */

                    pTmp[0] = x[chInIdx][0]; // Q(q_output)
@@ -816,8 +833,13 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                        stop = hLsSetUpConversion->sfbOffset[bandIdx + 1];

                        move16();



#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                        targetEne64 = 0;

                        move64();

#else

                        targetEne = 0;

                        move32();

#endif



                        /* Loop over all the bins in the band */

                        FOR( binIdx = start; binIdx < stop; binIdx++ )
@@ -825,15 +847,27 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                            tmpDMXSig = Mpy_32_32( L_shl_sat( dmxCoeff, 1 ), sig[0][binIdx] );

                            dmxSignalReal[binIdx] = L_add( dmxSignalReal[binIdx], tmpDMXSig );

                            move32();

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                            targetEne64 = W_mac_32_32( targetEne64, tmpDMXSig, tmpDMXSig );

#else

                            targetEne = L_add( targetEne, Mpy_32_32( tmpDMXSig, tmpDMXSig ) );



#endif

                            tmpDMXSig = Mpy_32_32( L_shl_sat( dmxCoeff, 1 ), mdst[binIdx] );

                            dmxSignalImag[binIdx] = L_add( dmxSignalImag[binIdx], tmpDMXSig );

                            move32();

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                            targetEne64 = W_mac_32_32( targetEne64, tmpDMXSig, tmpDMXSig );

#else                            

                            targetEne = L_add( targetEne, Mpy_32_32( tmpDMXSig, tmpDMXSig ) );

#endif

                        }

#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] ) );

#else

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

                        move32();

#endif

                    } /* end of band loop */

                }

            }
@@ -841,57 +875,70 @@ void ivas_ls_setup_conversion_process_mdct_fx( 


        FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )

        {

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

            Word32 tmpReal, tmpImag;

            Word64 DMXEne64;

#else

            Word32 tmpReal, tmpImag, DMXEne;

            Word16 DMXEne_exp;



#endif

            start = hLsSetUpConversion->sfbOffset[bandIdx];

            move16();

            stop = hLsSetUpConversion->sfbOffset[bandIdx + 1];

            move16();



            /* Loop over all the bins in the band */

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

            DMXEne64 = 0;

            move64();

#else

            DMXEne = 0;

            move32();

            DMXEne_exp = 0;

            move16();

#endif



            FOR( binIdx = start; binIdx < stop; binIdx++ )

            {

                tmpReal = dmxSignalReal[binIdx];

                move32();

                tmpImag = dmxSignalImag[binIdx];

                move32();



#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                DMXEne64 = W_mac_32_32( DMXEne64, tmpReal, tmpReal );

                DMXEne64 = W_mac_32_32( DMXEne64, tmpImag, tmpImag );

#else

                DMXEne = BASOP_Util_Add_Mant32Exp( DMXEne, DMXEne_exp, L_add( Mpy_32_32( tmpReal, tmpReal ), Mpy_32_32( tmpImag, tmpImag ) ), sub( 40, shl( q_output, 1 ) ), &DMXEne_exp );

#endif                

            }

#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] ) );

#else

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

            move32();

            dmxEnergy_exp_temp = s_max( dmxEnergy_exp_temp, dmxEnergy_exp[bandIdx] );

#endif

        }

    } /* end of out channel loop */



#ifndef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    /* Scaling to common exponent */

    FOR( bandIdx = 0; bandIdx < MAX_SFB + 2; bandIdx++ )

    {

        dmxEnergy[bandIdx] = L_shl( dmxEnergy[bandIdx], sub( dmxEnergy_exp[bandIdx], dmxEnergy_exp_temp ) );

        move32();

    }

#endif    

    /* Step 3: Peform energy smoothing */

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    Word16 pre_te_scale = getScaleFactor32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );

    scale_sig32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, pre_te_scale );

#else

    Word16 te_scale = getScaleFactor32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );

    scale_sig32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, te_scale );

#endif

    Word16 dmx_sacle = getScaleFactor32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );

    scale_sig32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, dmx_sacle );



#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

    Word16 te_scale = getScaleFactor32( targetEnergy, hLsSetUpConversion->sfbCnt );

    scale_sig32( targetEnergy, hLsSetUpConversion->sfbCnt, te_scale );

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



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

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

    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 );

#else

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

#endif
@@ -900,10 +947,21 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
    FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )

    {

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

        targetEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( targetEnergy[bandIdx], 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], pre_te_scale ) ) ) ) );

        Word32 targetEnergy, dmxEnergy;



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

        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 = 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;

        move32();

#else

        targetEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( targetEnergy[bandIdx], sub( te_max_e, sub( 40, shl( q_output, 1 ) ) ) ) ), 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 ) ) ) ) );

#endif

        move32();

        dmxEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( dmxEnergy[bandIdx], 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();
@@ -911,6 +969,7 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
        move32();

        hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx] = dmxEnergy[bandIdx]; /* dmx_prev_exp = 40 - 2*q_output */

        move32();

#endif

    }



    hLsSetUpConversion->te_prev_exp[0] = te_max_e; /* te_prev_exp = 40 - 2*q_output */
@@ -944,7 +1003,13 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                    move16();



                    /* Compute Eq gains */

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF    

                    ivas_lssetupconversion_computeEQFactor_fx( &hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->te_prev_exp[0],

                                                               &hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->dmx_prev_exp[0],

                                                               &eqGain ); // Q(eqGain) = 30

#else

                    ivas_lssetupconversion_computeEQFactor_fx( &targetEnergy[bandIdx], hLsSetUpConversion->te_prev_exp[0], &dmxEnergy[bandIdx], hLsSetUpConversion->dmx_prev_exp[0], &eqGain ); // Q(eqGain) = 30

#endif

                    FOR( binIdx = start; binIdx < stop; binIdx++ )

                    {

                        x[chInIdx][0][binIdx] = Mpy_32_32( L_shl( x[chInIdx][0][binIdx], 1 ), eqGain ); // Q - 1
@@ -964,8 +1029,13 @@ void ivas_ls_setup_conversion_process_mdct_fx( 
                    move16();



                    /* Compute Eq gains */

#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF

                    ivas_lssetupconversion_computeEQFactor_fx( &hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->te_prev_exp[0],

                                                               &hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->dmx_prev_exp[0],

                                                               &eqGain );

#else

                    ivas_lssetupconversion_computeEQFactor_fx( &targetEnergy[bandIdx], hLsSetUpConversion->te_prev_exp[0], &dmxEnergy[bandIdx], hLsSetUpConversion->dmx_prev_exp[0], &eqGain );



#endif

                    FOR( subFrameIdx = 0; subFrameIdx < NB_DIV; subFrameIdx++ )

                    {

                        IF( EQ_16( transform_type[chInIdx][subFrameIdx], TCX_10 ) )