Commit de17d224 authored by norvell's avatar norvell
Browse files

Merge branch '499-click-in-stereo-coded-at-32-kbps-48-khz-and-processed-by-fer-5' into 'main'

[Non BE] Add FIX_499_DFT_STEREO_PLC: wrong memory addressed in DFT stereo residual PLC

See merge request !672
parents 9232e2d6 0d5ea7f4
Loading
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -203,9 +203,8 @@
#define FIX_HBR_MASAMETA                                /* Nokia: Fixes to HBR MASA metadata at 384 and 512 kbps. Addresses issues 438 and 477 as well. */
#define FIX_482_DUMMYDEC_INIT                           /* Nokia: fix issue #428: missing inits for dummyDec in IVAS_rend */
#define FIX_468_16KHZ_PUPMIX                            /* Dlb: Fix issue 468 for Param Upmix at 16kHz sampling rate */
#define FIX_499_DFT_STEREO_PLC                          /* Eri: Fix for issue 499: Wrong past memory addressed for computing energy of DFT stereo residual ECU frame  */
#define FIX_489_COV_SMOOTHING                           /* Dlb: Fix covariance smoothing for ParamUpmix */


#define FIX_485_STATIC_BUFFERS                          /* FhG: move static buffers in DirAC parameter estimator to the DirAC struct */
#define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */
#define FIX_473_JITTER_NONDIEGETIC_PANNING              /* FhG,Orange: add missing non-diegetic panning to JITTER */
+4 −0
Original line number Diff line number Diff line
@@ -1738,7 +1738,11 @@ void stereo_dft_dec(

    if ( st0->bfi && !prev_bfi )
    {
#ifdef FIX_499_DFT_STEREO_PLC
        idx_k0 = ( hStereoDft->past_DMX_pos + STEREO_DFT_PAST_MAX - 1 ) % STEREO_DFT_PAST_MAX;
#else
        idx_k0 = ( hStereoDft->past_DMX_pos + 1 ) % STEREO_DFT_PAST_MAX;
#endif
        idx_k1 = ( idx_k0 + 1 ) % STEREO_DFT_PAST_MAX;
        /*dmx energy memory*/
        hStereoDft->past_dmx_nrg = stereo_dft_dmx_swb_nrg( hStereoDft->DFT_past_DMX[idx_k0], hStereoDft->DFT_past_DMX[idx_k1], min( hStereoDft->NFFT, STEREO_DFT32MS_N_32k ) );