Commit b6c03c90 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1563_FIX_STEREO_SW

parent 060d846d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
/* any switch which is non-be wrt. TS 26.258 V3.0 */



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

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

+0 −2
Original line number Diff line number Diff line
@@ -1563,12 +1563,10 @@ void stereo_switching_dec( 
            mvr2r( sts[0]->delay_buf_out, sts[1]->delay_buf_out, HQ_DELTA_MAX * HQ_DELAY_COMP );

            mvr2r( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );

        }

#ifdef FIX_1563_FIX_STEREO_SW

        else if ( hCPE->element_mode == IVAS_CPE_TD )

        {

            sts[1]->last_core = ACELP_CORE;

        }

#endif

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )

    {

lib_enc/ivas_stereo_switching_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -821,12 +821,10 @@ void stereo_switching_enc( 
            sts[1]->last_coder_type = sts[0]->last_coder_type;

            sts[1]->last_bwidth = sts[0]->last_bwidth;

        }

#ifdef FIX_1563_FIX_STEREO_SW

        else if ( hCPE->element_mode == IVAS_CPE_TD )

        {

            sts[1]->last_core = ACELP_CORE;

        }

#endif

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )

    {