Commit 6869414b authored by vaillancour's avatar vaillancour
Browse files

replacing TC (non-BE)

parent 1fec57a9

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
#ifdef EVS_NONBE_REUSAGE_1906

    #define REUSE_EVS_ACELP_SHIFT    // Add shift parameter as expected by EVS acelp subfunctions

    #define REUSE_EVS_ACELP_HL_AVQ   // Replace ACELP high layers by EVS

    //#define REUSE_EVS_ACELP_TC       // Replace TC by EVS TC

    #define REUSE_EVS_ACELP_TC       // Replace TC by EVS TC

#endif

lib_enc/acelp_core_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1390,7 +1390,11 @@ ivas_error acelp_core_enc_ivas_fx( 
        }

        ELSE IF( EQ_16( st->coder_type, TRANSITION ) )

        {

#ifdef REUSE_EVS_ACELP_TC

            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

        }

        ELSE IF( ppp_mode )

        {

lib_enc/enc_tran_fx.c

+12 −3
Original line number Diff line number Diff line
@@ -100,7 +100,9 @@ Word16 encod_tran_fx( 
    BSTR_ENC_HANDLE hBstr = st_fx->hBstr;

    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;

    LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;



#ifdef REUSE_EVS_ACELP_TC

    set16_fx( h1, 0, L_SUBFR + ( M + 1 ) );

#endif

    L_frame_fx = st_fx->L_frame;

    move16();

    /*------------------------------------------------------------------*
@@ -143,7 +145,13 @@ Word16 encod_tran_fx( 
    move16();

    set16_fx( code_preQ, 0, L_SUBFR );

    shift_wsp = add( Q_new, shift );



#ifdef REUSE_EVS_ACELP_TC

    test();

    if ( st_fx->element_mode > EVS_MONO && LT_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) )

    {

        shift_wsp = sub( shift_wsp, 1 );

    }

#endif

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

     * ACELP subframe loop

     *----------------------------------------------------------------*/
@@ -416,7 +424,7 @@ Word16 encod_tran_fx( 


    return tc_subfr;

}



#ifndef REUSE_EVS_ACELP_TC

Word16 encod_tran_ivas_fx(

    Encoder_State *st_fx,     /* i/o: state structure                                   */

    const Word16 speech_fx[], /* i  : input speech                                      Q0*/
@@ -828,3 +836,4 @@ Word16 encod_tran_ivas_fx( 


    return tc_subfr;

}

#endif
 
 No newline at end of file

lib_enc/transition_enc_fx.c

+6 −5
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
static void gain_trans_enc_fx( Word32 gain_trans32, Word16 exc[], Word16 *quant_index, Word16 *quant_sign, Word16 Q_new );



static void tc_enc_fx( Encoder_State *st_fx, const Word16 i_subfr, Word16 *tc_subfr, Word16 *position, const Word16 *h1_fx, const Word16 *xn_fx, Word16 *exc_fx, Word16 *yy1_fx, Word16 *T0_min, Word16 *T0_max, Word16 *T0, Word16 *T0_frac, Word16 *gain_pit_fx, Word16 g_corr_fx[], Word16 *bwe_exc_fx, Word16 Q_new );

#ifndef REUSE_EVS_ACELP_TC

static void tc_enc_ivas_fx( Encoder_State *st_fx, const Word16 i_subfr, Word16 *tc_subfr, Word16 *position, const Word16 *h1_fx, const Word16 *xn_fx, Word16 *exc_fx, Word16 *yy1_fx, Word16 *T0_min, Word16 *T0_max, Word16 *T0, Word16 *T0_frac, Word16 *gain_pit_fx, Word16 g_corr_fx[], Word16 *bwe_exc_fx, Word16 Q_new );



#endif



/*==========================================================================*/

/* FUNCTION   : void transition_enc_fx ()								    */
@@ -930,7 +931,7 @@ void transition_enc_fx( 


    return;

}



#ifndef REUSE_EVS_ACELP_TC

void transition_enc_ivas_fx(

    Encoder_State *st_fx, /* i/o: encoder state structure */

    const Word16 i_subfr, /* i  : subframe index                              */
@@ -1823,7 +1824,7 @@ void transition_enc_ivas_fx( 


    return;

}



#endif

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

 * tc_enc()

 *
@@ -2084,7 +2085,7 @@ static void tc_enc_fx( 
    move16();

    return;

}



#ifndef REUSE_EVS_ACELP_TC

static void tc_enc_ivas_fx(

    Encoder_State *st_fx, /* i/o: encoder state structure */

    const Word16 i_subfr, /* i  : subrame index                           */
@@ -2329,7 +2330,7 @@ static void tc_enc_ivas_fx( 
    move16();

    return;

}



#endif



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

 * gain_trans_enc()