Commit 6c32f1d8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1563_FIX_STEREO_SW

parent 1bb0f9ff

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_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 */

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

lib_dec/ivas_stereo_switching_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -2009,13 +2009,11 @@ void stereo_switching_dec_fx( 
            Copy( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );              /* Q_old_syn_Overl*/

            sts[1]->hTcxDec->Q_old_syn_Overl = sts[0]->hTcxDec->Q_old_syn_Overl;

        }

#ifdef FIX_1563_FIX_STEREO_SW

        ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_TD ) )

        {

            sts[1]->last_core = ACELP_CORE;

            move16();

        }

#endif

    }

    ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_TD ) && EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) )

    {

lib_enc/ivas_stereo_switching_enc_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -520,14 +520,9 @@ ivas_error stereo_memory_enc_fx( 
            st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;

            move16();

            move16();

#ifdef FIX_1563_FIX_STEREO_SW

            set16_fx( st->hTcxEnc->old_out_fx, 0, L_FRAME32k );

            st->hTcxEnc->Q_old_out = 0;

            move16();

#else

            // set_f( st->hTcxEnc->old_out, 0, L_FRAME32k );

            // set_f( st->hTcxEnc->spectrum_long, 0, N_MAX );

#endif

            set32_fx( st->hTcxEnc->spectrum_long_fx, 0, N_MAX );

            st->hTcxEnc->spectrum_long_e = 0;

            st->hTcxEnc->tfm_mem_fx = 1610612736; /* 0.75 in Q31 */
@@ -988,13 +983,11 @@ void stereo_switching_enc_fx( 
            sts[1]->last_bwidth = sts[0]->last_bwidth; /* Q0 */

            move16();

        }

#ifdef FIX_1563_FIX_STEREO_SW

        ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_TD ) )

        {

            sts[1]->last_core = ACELP_CORE;

            move16();

        }

#endif

    }

    ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_TD ) && EQ_16( hCPE->last_element_mode, IVAS_CPE_MDCT ) )

    {