Commit d4128103 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh Committed by multrus
Browse files

Remove DFT_PRED_RES scaling in past_dmx_nrg calculation in stereo_dft_generate_res_pred_fx()

parent a751273d
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -3171,16 +3171,25 @@ void stereo_dft_generate_res_pred_fx(
                    move32();
                    DFT_PRED_RES[2 * i + 1] = L_add( L_shl( Mpy_32_16_1( hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i + 1], g_short ), q_shift0 ), L_shl( Mpy_32_16_1( hStereoDft->DFT_past_DMX_fx[d_long_ind][2 * i + 1], g_long ), q_shift1 ) ); /* q_dft */
                    move32();
#ifndef FIX_1946_CRASH_JBM_PROCESSING
                    past_dmx_nrg = Madd_32_32( Madd_32_32( past_dmx_nrg, DFT_PRED_RES[2 * i], DFT_PRED_RES[2 * i] ), DFT_PRED_RES[2 * i + 1], DFT_PRED_RES[2 * i + 1] ); /* q_dft */
#endif
                }
                test();
                IF( !bfi || GE_16( b, hStereoDft->res_cod_band_max ) )
                {
                    Word16 q_div;
                    Word16 op;
#ifdef FIX_1946_CRASH_JBM_PROCESSING
                    FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                    {
                        past_dmx_nrg = Madd_32_32( Madd_32_32( past_dmx_nrg, DFT_PRED_RES[2 * i], DFT_PRED_RES[2 * i] ), DFT_PRED_RES[2 * i + 1], DFT_PRED_RES[2 * i + 1] ); /* q_dft */
                    }
#endif
                    op = BASOP_Util_Divide3232_Scale( L_add( 1, dmx_nrg ), L_add( 1, past_dmx_nrg ), &q_div ); /* q_sqrt */
                    q_sqrt = q_div;
                    move16();

                    norm_fac = Sqrt16( op, &q_sqrt );
                    g2 = Mpy_32_16_1( pPredGain[b], norm_fac ); /* Q31 */
                    IF( LE_32( q_sqrt, norm_l( g2 ) ) )