Commit 43e0a18c authored by vaillancour's avatar vaillancour
Browse files

switch activation

parent d5ad6b97

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
//#define REMOVE_A_SCALE





#if 0        // diminish MLD by ~1 on NO_S

#if 1        // diminish MLD by ~1 on NO_S





#define USE_EVS_FUNC_LP        // -> BE for IVAS, but condition seems missing compared to float for rf condition

lib_enc/acelp_core_enc_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ ivas_error acelp_core_enc_ivas_fx( 
        ELSE IF( EQ_16( st->coder_type, TRANSITION ) )

        {

#ifdef TRY_SHIFT_ACELP 

            encod_tran_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, tc_subfr, position, unbits, shift, Q_new );

            encod_tran_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, tc_subfr, position, unbits, shift, Q_new );

#else

            encod_tran_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, tc_subfr, position, unbits, 0, Q_new );

#endif
@@ -1417,8 +1417,8 @@ ivas_error acelp_core_enc_ivas_fx( 
        {

            /* GENERIC, VOICED and INACTIVE frames (coded by AVQ technology) */

#ifdef TRY_SHIFT_ACELP

            //encod_gen_voic_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

            encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

            encod_gen_voic_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

            //encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

#else

            encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, 0, Q_new );

#endif

lib_enc/enc_gen_voic_fx.c

+8 −3
Original line number Diff line number Diff line
@@ -165,7 +165,12 @@ void encod_gen_voic_fx( 
    set16_fx( code_preQ_fx, 0, L_SUBFR );



    shift_wsp = add( Q_new, shift );



#ifdef TRY_SHIFT_ACELP

    if ( st_fx->element_mode > EVS_MONO )

    {

        shift_wsp = sub( shift_wsp, 1 );

    }

#endif

    /* set and write harmonicity flag */

    harm_flag_acelp = 0;

    move16();
@@ -540,8 +545,8 @@ void encod_gen_voic_ivas_fx( 
    /*------------------------------------------------------------------*

     * ACELP subframe loop

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

#if defined USE_EVS_FUNC_LP && !defined USE_EVS_FUNC_FT_G

    if ( st_fx->core_brate < MIN_BRATE_AVQ_EXC )

#if defined USE_EVS_FUNC_LP

    //if ( st_fx->core_brate < MIN_BRATE_AVQ_EXC )

        shift_wsp = sub( shift_wsp, 1 );

#endif

    FOR( i_subfr_fx = 0; i_subfr_fx < L_frame; i_subfr_fx += L_SUBFR )

lib_enc/enc_tran_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -144,6 +144,12 @@ Word16 encod_tran_fx( 
    set16_fx( code_preQ, 0, L_SUBFR );

    shift_wsp = add( Q_new, shift );



#ifdef TRY_SHIFT_ACELP

    if ( st_fx->element_mode > EVS_MONO )

    {

        shift_wsp = sub( shift_wsp, 1 );

    }

#endif

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

     * ACELP subframe loop

     *----------------------------------------------------------------*/
@@ -523,7 +529,7 @@ Word16 encod_tran_ivas_fx( 
    set16_fx( code_preQ, 0, L_SUBFR );

    shift_wsp = add( Q_new, shift );

#ifdef USE_EVS_FUNC_LP

    if ( st_fx->core_brate < MIN_BRATE_AVQ_EXC )

    //if ( st_fx->core_brate < MIN_BRATE_AVQ_EXC )

        shift_wsp = sub( shift_wsp, 1 );

#endif

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