Commit aa6fc693 authored by reutelhuber's avatar reutelhuber
Browse files

Merge branch... 

Merge branch '347-crash-in-sba-dtx-modes-with-longer-testvectors-when-decoding-to-stereo' into 'main'

Resolve "Crash in SBA DTX modes with longer testvectors when decoding to stereo"

See merge request !448
parents 1c5cc5c7 4be250ea

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ 


#define DFT_STEREO_SPAR_MIXING

#ifdef DFT_STEREO_SPAR_MIXING

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

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

#define FIX_347_DTX_CRASH                            /* FhG: Fix crash that can happen with DTX */

/*#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_core_dec.c

100644 → 100755
+8 −0
Original line number Diff line number Diff line
@@ -240,7 +240,11 @@ ivas_error ivas_core_dec( 
        hCPE->hStereoCng->flag_cna_fade = 0;

    }



#ifdef FIX_347_DTX_CRASH

    if ( sba_dirac_stereo_flag && hSCE && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG )

#else

    if ( sba_dirac_stereo_flag && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG )

#endif

    {

        save_hb_synth = hSCE->save_hb_synth;

    }
@@ -461,7 +465,11 @@ ivas_error ivas_core_dec( 




        /* for FD-CNG we need the delay compensation in the synth, so do this afterwards */

#ifdef FIX_347_DTX_CRASH

        if ( sba_dirac_stereo_flag && hSCE && st->core_brate == SID_2k40 && st->cng_type == FD_CNG )

#else

        if ( sba_dirac_stereo_flag && st->core_brate == SID_2k40 && st->cng_type == FD_CNG )

#endif

        {

            mvr2r( synth[n], hSCE->save_synth, output_frame );

        }