Commit 97f0c43b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1562_DTX_CRASH_DECODER

parent 6c32f1d8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 


#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */

lib_dec/acelp_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -412,12 +412,8 @@ ivas_error acelp_core_dec_fx( 
    {

        Word16 dec;



#ifdef FIX_1562_DTX_CRASH_DECODER

        test();

        IF( st->hPFstat != NULL && st->hPFstat->on != 0 )

#else

        IF( ( st->hPFstat->on != 0 ) )

#endif

        {

            Word16 mem_syn_r_size_old, mem_syn_r_size_new;

            mem_syn_r_size_old = mult_r( 2048, st->last_L_frame ); /* 1.25/20.f = 2048 (Q15)*/