Commit 33216819 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fix for 3GPP issue 1192: Energy bursts in BWE region for MDCT-stereo@80kbps FB - 2 

Link #1192
parent 0ca1f14f

lib_enc/ivas_stereo_mdct_core_enc.c

+11 −8
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ void stereo_mdct_core_enc_fx( 
    Word32 orig_spectrum_long_fx[CPE_CHANNELS][N_MAX]; /* MDCT output (L/R). */

    Word32 *orig_spectrum_fx[CPE_CHANNELS][NB_DIV];    /* Pointers to MDCT output for a short block (L/R) */

    Word32 powerSpec_fx[CPE_CHANNELS][N_MAX];

    Word32 powerSpec_fx_tmp[CPE_CHANNELS][N_MAX]; /* This 32 bit buffer is created to preserve the precision for original separate Q calculation of powerSpec_fx buffer ( Related to 3gpp issue #1192 ) */

    Word32 *p_powerSpec_fx[CPE_CHANNELS];

    Word16 exp_powerSpec[CPE_CHANNELS][N_MAX + L_MDCT_OVLP_MAX];

    Word32 powerSpecMsInv_long_fx[CPE_CHANNELS][N_MAX]; /* MS inv power spectrum, also inverse MDST spectrum */
@@ -187,6 +188,7 @@ void stereo_mdct_core_enc_fx( 
        p_orig_spectrum_long_fx[ch] = orig_spectrum_long_fx[ch];

        orig_spectrum_fx[ch][0] = orig_spectrum_long_fx[ch];

        orig_spectrum_fx[ch][1] = orig_spectrum_long_fx[ch] + N_TCX10_MAX;

        set16_fx( exp_powerSpec[ch], 0, N_MAX + L_MDCT_OVLP_MAX );

    }



    set16_fx( tmp_q_powSpecInv, 63, N_MAX );
@@ -267,6 +269,7 @@ void stereo_mdct_core_enc_fx( 
        set32_fx( quantized_spectrum_long_fx[ch], 0, N_MAX );

        set32_fx( mdst_spectrum_long_fx[ch], 0, N_MAX );

        set32_fx( powerSpec_fx[ch], 0, N_MAX );

        set32_fx( powerSpec_fx_tmp[ch], 0, N_MAX );

        set32_fx( powerSpecMsInv_long_fx[ch], 0, N_MAX );

        sts[ch]->hTcxEnc->tns_ms_flag[0] = 0;

        move16();
@@ -513,6 +516,8 @@ void stereo_mdct_core_enc_fx( 
                {

                    q_powSpec[ch] = s_min( q_powSpec[ch], tmp_q_powSpec[i] );

                    move16();

                    exp_powerSpec[ch][i] = sub( Q31, tmp_q_powSpec[i] );

                    move16();

                }

            }

            FOR( n = 0; n < nSubframes; n++ )
@@ -532,7 +537,9 @@ void stereo_mdct_core_enc_fx( 
                FOR( i = 0; i < L_subframeTCX; i++ )

                {

                    powerSpecMsInv_fx[ch][n][i] = L_shr_sat( powerSpecMsInv_fx[ch][n][i], sub( tmp_q_psi[n][i], q_powSpecMsInv[ch] ) );

                    powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i + ( n * L_subframeTCX )], q_powSpec[ch] ) ); /* q_powSpec */

                    /* Here precision is preserved for powerSpec_fx buffer by storing the fixed Q copy of same buffer in powerSpec_fx_tmp buffer */

                    /* powerSpec_fx implementation has separate Q for each index, powerSpec_fx_tmp has all indices in same Q beyond this point   */

                    powerSpec_fx_tmp[ch][( i + ( n * L_subframeTCX ) )] = L_shr( powerSpec_fx[ch][( i + ( n * L_subframeTCX ) )], sub( tmp_q_powSpec[i + ( n * L_subframeTCX )], q_powSpec[ch] ) ); /* q_powSpec */

                    move32();

                    move32();

                }
@@ -569,7 +576,7 @@ void stereo_mdct_core_enc_fx( 
             * and quantization (0: tonal, 1: noise-like).               *

             * Detect low pass if present.                               *

             *-----------------------------------------------------------*/

            ComputeSpectrumNoiseMeasure_fx( powerSpec_fx[ch], L_subframeTCX, i_mult( st->hTcxEnc->nmStartLine, idiv1616( L_subframeTCX, st->hTcxEnc->L_frameTCX ) ),

            ComputeSpectrumNoiseMeasure_fx( powerSpec_fx_tmp[ch], L_subframeTCX, i_mult( st->hTcxEnc->nmStartLine, idiv1616( L_subframeTCX, st->hTcxEnc->L_frameTCX ) ),

                                            NE_32( imult3216( st->last_sr_core, st->L_frame ), imult3216( st->sr_core, st->L_frame_past ) ) || NE_16( st->last_core, TCX_20_CORE ), st->hTcxEnc->memQuantZeros, L_subframeTCX );

        }
@@ -603,8 +610,8 @@ void stereo_mdct_core_enc_fx( 
                IF( ( NE_16( hStereoMdct->mdct_stereo_mode[n], hStereoMdct->IGFStereoMode[n] ) || EQ_16( hStereoMdct->mdct_stereo_mode[n], SMDCT_BW_MS ) ) && !hStereoMdct->isSBAStereoMode )

                {

                    IGF_ENC_INSTANCE_HANDLE hIGFEnc[CPE_CHANNELS];

                    p_powerSpec_fx[0] = powerSpec_fx[0];

                    p_powerSpec_fx[1] = powerSpec_fx[1];

                    p_powerSpec_fx[0] = powerSpec_fx_tmp[0];

                    p_powerSpec_fx[1] = powerSpec_fx_tmp[1];

                    hIGFEnc[0] = sts[0]->hIGFEnc;

                    hIGFEnc[1] = sts[1]->hIGFEnc;
@@ -669,8 +676,6 @@ void stereo_mdct_core_enc_fx( 


                        Scale_sig32( orig_spectrum_fx[ch][n], N_TCX10_MAX, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */



                        set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );



                        ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );

                    }

                }
@@ -711,8 +716,6 @@ void stereo_mdct_core_enc_fx( 


                        Scale_sig32( orig_spectrum_fx[ch][n], N_TCX10_MAX, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */



                        set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );



                        ProcessIGF_ivas_fx( st, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );

                    }

                }