Commit 1bb0f9ff authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2491_MDCT_JBM_CLICK

parent 9d92bd14

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

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

lib_dec/er_dec_tcx_fx.c

+0 −15
Original line number Diff line number Diff line
@@ -941,22 +941,7 @@ void con_tcx_fx( 
    }

    ELSE

    {

#ifdef FIX_BASOP_2491_MDCT_JBM_CLICK

        tmp_deemph = shl_sat( tmp_deemph, Q_syn ); /*Q_syn*/

#else

        IF( NE_16( st->element_mode, EVS_MONO ) ) // to keep evs bit-exactness

        {

            if ( GT_16( sub( Q_syn, st->Q_syn_factor ), scf ) )

            {

                Q_syn = add( scf, st->Q_syn_factor ); // so that (Q_syn - st->Q_syn_factor) = scf;

            }

            tmp_deemph = shl_sat( tmp_deemph, sub( Q_syn, st->Q_syn_factor ) );

        }

        ELSE

        {

            tmp_deemph = shl_sat( tmp_deemph, Q_syn ); /*Q_syn*/

        }

#endif

        st->Q_syn_factor = 0;

        move16();

        st->Q_syn = Q_syn;

lib_dec/ivas_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -766,7 +766,6 @@ ivas_error ivas_core_dec_fx( 
         *---------------------------------------------------------------------*/



        /*core_switching_post_dec*/

#ifdef FIX_BASOP_2491_MDCT_JBM_CLICK

        IF( EQ_16( sts[n]->element_mode, IVAS_CPE_MDCT ) && GT_32( sts[n]->core_brate, SID_2k40 ) ) // In this case, st->Q_syn_factor was already applied earlier in ivas_mdct_core_reconstruct_fx()

        {

            Q_synth = sub( 15, e_sig[0] );
@@ -775,9 +774,6 @@ ivas_error ivas_core_dec_fx( 
        {

            Q_synth = add( sub( 15, e_sig[0] ), st->Q_syn_factor );

        }

#else

        Q_synth = add( sub( 15, e_sig[0] ), st->Q_syn_factor );

#endif



        IF( st->cldfbSyn != NULL )

        {