Commit 4f4597f8 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Remove DFT_PRED_RES scaling in past_dmx_nrg calculation in stereo_dft_generate_res_pred_fx()

parent 586d126c
Loading
Loading
Loading
Loading
Loading
+2 −21
Original line number Diff line number Diff line
@@ -3178,37 +3178,18 @@ void stereo_dft_generate_res_pred_fx(
                test();
                IF( !bfi || GE_16( b, hStereoDft->res_cod_band_max ) )
                {
#ifdef FIX_1946_CRASH_JBM_PROCESSING
                    Word16 q_div, scaleFactor;
#else
                    Word16 q_div;
#endif
                    Word16 op;
#ifdef FIX_1946_CRASH_JBM_PROCESSING
                    scaleFactor = getScaleFactor32( &DFT_PRED_RES[shl( hStereoDft->band_limits[b], 1 )], sub( shl( len, 1 ), 1 ) ); // calc it in the range [2*hStereoDft->band_limits[b] : 2*(len-1)+1]
                    IF( GT_16( scaleFactor, 3 ) )
                    {
                        scaleFactor = sub( scaleFactor, 3 ); // add headroom
                    }
                    ELSE
                    {
                        scaleFactor = 0; // no guard added since it was fine without scaleFactor
                        move16();
                    }
                    FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
                    {
                        Word32 x_2i = L_shl( DFT_PRED_RES[2 * i], scaleFactor );
                        Word32 x_2ip1 = L_shl( DFT_PRED_RES[2 * i + 1], scaleFactor );
                        past_dmx_nrg = Madd_32_32( Madd_32_32( past_dmx_nrg, x_2i, x_2i ), x_2ip1, x_2ip1 ); /* q_dft - 2*scaleFactor */
                        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 */
#ifdef FIX_1946_CRASH_JBM_PROCESSING
                    q_sqrt = add( q_div, shl( scaleFactor, 1 ) );
#else
                    q_sqrt = q_div;
#endif
                    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 ) ) )