Commit e7bea40b authored by Manuel Jander's avatar Manuel Jander
Browse files

Cleanup: remove inactive switches. Reduce differences to main branch.

parent e015255f

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -87,11 +87,8 @@ 
#define NONBE_FIX_ISSUE_2206                            /* FhG: Calculate st->q_inp and Q_new dynamically for all data paths instead of assuming constant values */

#define NONBE_FIX_ISSUE_2206_TV1                        /* VA/FhG: Calculate st->q_inp also considering st->mem_q decimation memory to avoid saturation */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT             /* FhG: Dynamic scale of shb_speech buffers */

// #define NONBE_FIX_ISSUE_2206_DO_NOT_FLUSH_TO_ZERO       /* FhG: Do not right shift flush to zero in Copy_Scale_sig_nosat */

#define NONBE_FIX_ISSUE_2206_TD_CHANNEL_EXTRAPOLATION   /* FhG: Use different scale to avoid saturation of LPC coefficient in TD Stereo signal extrapolation. */

// #define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

// #define NONBE_FIX_ISSUE_2206_CLEAR_TRAILING_OLD_WTDA  /* FhG: clear trailing samples in wtda buffer. apparently no effect. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Alternative: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_2480_HARM_TONALMDCT                         /* FhG: basop issue 2480: Harmonize TonalMDCTConceal_Detect_fx() and TonalMDCTConceal_Detect_ivas_fx() */

lib_com/tools_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -1266,9 +1266,6 @@ void Copy_Scale_sig_nosat( 
    Word16 i;

    Word16 tmp;



#ifdef NONBE_FIX_ISSUE_2206_DO_NOT_FLUSH_TO_ZERO

    assert( exp0 <= 15 && exp0 >= -15 );

#endif

    IF( exp0 == 0 )

    {

        FOR( i = 0; i < lg; i++ )
@@ -1278,7 +1275,6 @@ void Copy_Scale_sig_nosat( 
        }

        return;

    }

#ifndef NONBE_FIX_ISSUE_2206_DO_NOT_FLUSH_TO_ZERO

    IF( exp0 < -15 )

    {

        FOR( i = 0; i < lg; i++ )
@@ -1288,7 +1284,6 @@ void Copy_Scale_sig_nosat( 
        }

        return;

    }

#endif

    IF( exp0 < 0 )

    {

        tmp = shl( -32768, exp0 ); /* we use negative to correctly represent 1.0 */

lib_enc/cng_enc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1700,6 +1700,7 @@ static Word16 shb_DTX_fx( 


    shb_ener_fx = L_add( Mpy_32_16_1( shb_ener_fx, 102 ), 1 ); /* ( 1 / L_FRAME16K ) -> 102 in Q15, shb_ener_fx in Q1 */

#endif



    wb_ener_fx = L_deposit_l( 0 );

    FOR( i = 0; i < st->L_frame; i++ )

    {

lib_enc/evs_enc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ ivas_error evs_enc_fx( 
    st->hBWE_FD->old_fdbwe_speech_q = -1;

    move16();

#endif



    /*------------------------------------------------------------------*

     * Initializiation

     *-----------------------------------------------------------------*/

lib_enc/ext_sig_ana_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -635,11 +635,7 @@ void core_signal_analysis_high_bitrate_ivas_fx( 


        nexp = s_max( s_max( st->exp_buf_speech_enc, st->exp_buf_speech_enc_pe ), st->exp_mem_preemph_enc );

        scale_sig( st->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k, sub( st->exp_buf_speech_enc_pe, nexp ) );

#ifndef NONBE_FIX_ISSUE_2206_DO_NOT_FLUSH_TO_ZERO

        Copy_Scale_sig_nosat( st->speech_enc + st->encoderLookahead_enc, st->new_speech_enc_pe, L_frame, sub( st->exp_buf_speech_enc, nexp ) );

#else

        Copy_Scale_sig_nosat( st->speech_enc + st->encoderLookahead_enc, st->new_speech_enc_pe, L_frame, s_max( -15, sub( st->exp_buf_speech_enc, nexp ) ) );

#endif

        st->mem_preemph_enc = shl( st->mem_preemph_enc, sub( st->exp_mem_preemph_enc, nexp ) );

        st->exp_mem_preemph_enc = nexp;

        move16();