Commit 0f4cbdcc authored by vaclav's avatar vaclav
Browse files

Merge branch 'float-1562-crash-in-stereo-decoding-in-dtx-and-bitrate-switching' into 'main' 

Resolve "Crash in stereo decoding in DTX and bitrate switching"

See merge request !2917
parents a29bd934 6d05b2a9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */

#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

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



/* ##################### End NON-BE switches ########################### */

lib_dec/acelp_core_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -408,7 +408,12 @@ 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)*/