Commit 38f9dddc authored by Arash Azizi's avatar Arash Azizi
Browse files

issue 2615: Changing instances of function to match the new argument

parent cdf00750

lib_dec/ivas_stereo_dft_dec_dmx_fx.c

+10 −2
Original line number Diff line number Diff line
@@ -125,7 +125,11 @@ void stereo_dft_unify_dmx_fx( 
    }

    IF( prev_bfi )

    {

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

        dmx_nrg = stereo_dft_dmx_swb_nrg_fx(DFT[0], DFT[0] + STEREO_DFT32MS_N_MAX, s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), 0, 0);

#else

        dmx_nrg = stereo_dft_dmx_swb_nrg_fx(DFT[0], DFT[0] + STEREO_DFT32MS_N_MAX, s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), 0, 0, hStereoDft->q_dft);

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING

    }



    /* Analyze nature of current frame */
@@ -382,7 +386,11 @@ void stereo_dft_unify_dmx_fx( 
            q_shift1 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k1] );



            /*dmx energy memory*/

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

            hStereoDft->past_dmx_nrg_fx = stereo_dft_dmx_swb_nrg_fx(hStereoDft->DFT_past_DMX_fx[idx_k0], hStereoDft->DFT_past_DMX_fx[idx_k1], s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), q_shift0, q_shift1); /* 2 * q_dft */

#else

            hStereoDft->past_dmx_nrg_fx = stereo_dft_dmx_swb_nrg_fx(hStereoDft->DFT_past_DMX_fx[idx_k0], hStereoDft->DFT_past_DMX_fx[idx_k1], s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), q_shift0, q_shift1, hStereoDft->q_dft); /* 2 * q_dft */

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING

            move32();

        }

    }

lib_dec/ivas_stereo_dft_dec_fx.c

+12 −3
Original line number Diff line number Diff line
@@ -1936,7 +1936,11 @@ void stereo_dft_dec_fx( 
    move32();

    IF( prev_bfi )

    {

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

        dmx_nrg = stereo_dft_dmx_swb_nrg_fx(DFT[0], DFT[0] + STEREO_DFT32MS_N_MAX, s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), 0, 0); /* Q0 */

#else

        dmx_nrg = stereo_dft_dmx_swb_nrg_fx(DFT[0], DFT[0] + STEREO_DFT32MS_N_MAX, s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), 0, 0, hStereoDft->q_dft); /* Q0 */

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING

    }



    FOR( k = 0; k < N_div; k++ )
@@ -2657,7 +2661,12 @@ void stereo_dft_dec_fx( 
        q_shift0 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k0] );

        q_shift1 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k1] );

        /*dmx energy memory*/

#ifndef FIX_ISSUE_2615_FALSE_SHIFTING

        hStereoDft->past_dmx_nrg_fx = stereo_dft_dmx_swb_nrg_fx(hStereoDft->DFT_past_DMX_fx[idx_k0], hStereoDft->DFT_past_DMX_fx[idx_k1], s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), q_shift0, q_shift1); /* 2 * q_DFT */

#else

        hStereoDft->past_dmx_nrg_fx = stereo_dft_dmx_swb_nrg_fx(hStereoDft->DFT_past_DMX_fx[idx_k0], hStereoDft->DFT_past_DMX_fx[idx_k1], s_min(hStereoDft->NFFT, STEREO_DFT32MS_N_32k), q_shift0, q_shift1, hStereoDft->q_dft); /* 2 * q_DFT */

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING



            }



    stereo_dft_compute_td_stefi_params_fx( hStereoDft, samp_ratio );

lib_dec/ivas_stereo_dft_plc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -784,8 +784,6 @@ Word32 stereo_dft_dmx_swb_nrg_fx( 
    const Word16 q1,

    const Word16 q_dft)

#endif // !FIX_ISSUE_2615_FALSE_SHIFTING





{

    Word16 i;

    Word32 dmx_nrg;