Commit 2342c56d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_347_DTX_CRASH

parent 4f7bb9eb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 
/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



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

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

#define FIX_107_5MS_SUBFRAME_RENDERING

#define REMOVE_FORCE_SUBFRAME_BIN                       /* Issue 355: remove obsolete "-force_subframe_bin" command-line option. */

lib_dec/ivas_core_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -240,11 +240,7 @@ 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,11 +457,7 @@ 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 );

        }