Commit 69875a00 authored by reutelhuber's avatar reutelhuber
Browse files

Merge branch '345-memory-error-in-planar-sba-with-frameloss' into 'main' 

Resolve "Memory error in (Planar)SBA with frameloss"

See merge request !440
parents 9166a5e7 1bd8f423

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 


#define DFT_STEREO_SPAR_MIXING

#ifdef DFT_STEREO_SPAR_MIXING

#define FIX_345_MSAN_ERROR                           /* FhG. Fix memory sanitizer error in PLC modes */

/*#define DFT_STEREO_SPAR_MIXING_DEBUG*/             /* more debugging output for DFT_STEREO_SPAR_MIXING_DEBUG */

#define DISABLE_RES_CHANNELS_MCT                     /* decode only W and residual for Y when outputting to stereo */

#endif

lib_dec/ivas_sba_dirac_stereo_dec.c

100755 → 100644
+6 −2
Original line number Diff line number Diff line
@@ -964,12 +964,16 @@ void ivas_sba_dirac_stereo_dec( 
        mvr2r( tmp_buf, hSCE->prev_hb_synth, memOffset );

    }



    if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag )

    if ( ( hCPE->hCoreCoder[0]->core == ACELP_CORE || hCPE->hCoreCoder[0]->last_core == ACELP_CORE ) && !fd_cng_flag

#if defined DFT_STEREO_SPAR_MIXING && defined FIX_345_MSAN_ERROR

         && st_ivas->nchan_transport == 1

#endif

    )

    {

        /* upmix ACELP BWE */

        ivas_sba_dirac_stereo_compute_hb_gain( hStereoDft, hb_gain );



#ifdef DFT_STEREO_SPAR_MIXING

#if defined DFT_STEREO_SPAR_MIXING && !defined FIX_345_MSAN_ERROR

        if ( st_ivas->nchan_transport == 1 )

#endif

        {