Commit 8a408c5c authored by vaillancour's avatar vaillancour
Browse files

reusing EVS for switching

parent 8089ab9f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define REUSE_EVS_ACELP_TC



#if 0  // To be activated when everything is completed

#define REUSE_EVS_TBE_CELP_EXC     // to be done , just a line to be added 

#define REUSE_EVS_ACELP_2t32

#define REUSE_EVS_ACELP_1t64

#endif

lib_enc/acelp_core_switch_enc_fx.c

+8 −4
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ static void encod_gen_voic_core_switch_fx( Encoder_State *st_fx, 
                                           const Word32 core_bitrate_fx,

                                           Word16 shift,

                                           Word16 Q_new );

#ifndef REUSE_EVS_ACELP

static void encod_gen_voic_core_switch_ivas_fx( Encoder_State *st_fx,

                                                const Word16 L_frame_fx,

                                                const Word16 inp_fx[],
@@ -35,7 +36,7 @@ static void encod_gen_voic_core_switch_ivas_fx( Encoder_State *st_fx, 
                                                const Word32 core_bitrate_fx,

                                                Word16 shift,

                                                Word16 Q_new );



#endif

static void bwe_switch_enc_fx( Encoder_State *st_fx, const Word16 *new_speech );

static void bwe_switch_enc_ivas_fx( Encoder_State *st_fx, const Word16 *new_speech );
@@ -278,8 +279,11 @@ void acelp_core_switch_enc_ivas_fx( 
    config_acelp1_IVAS( ENC, st_fx->total_brate, cbrate, st_fx->core, -1, -1, st_fx->last_L_frame, -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot,

                        GENERIC, st_fx->inactive_coder_type_flag, -1, -1, &j, &i, st_fx->element_mode, &i /*dummy*/, 0 /*tdm_lp_reuse_flag*/, 0 /*tdm_low_rate_mode*/, st_fx->idchan, st_fx->active_fr_cnt_fx, 0 /*tdm_Pitch_reuse_flag*/, 0, 0 /*GSC_IVAS_mode*/ );



#ifndef REUSE_EVS_ACELP

    encod_gen_voic_core_switch_ivas_fx( st_fx, st_fx->last_L_frame, inp, Aq, A, T_op, exc, cbrate, shift, Q_new );



#else

    encod_gen_voic_core_switch_fx( st_fx, st_fx->last_L_frame, inp, Aq, A, T_op, exc, cbrate, shift, Q_new );

#endif

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

     * bit-stream: modify the layer of sub frame CELP

     *----------------------------------------------------------------*/
@@ -521,7 +525,7 @@ static void encod_gen_voic_core_switch_fx( 


    return;

}



#ifndef REUSE_EVS_ACELP

static void encod_gen_voic_core_switch_ivas_fx(

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

    const Word16 L_frame,      /* i  : length of the frame              Q0*/
@@ -734,7 +738,7 @@ static void encod_gen_voic_core_switch_ivas_fx( 


    return;

}



#endif



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

 * bwe_switch_enc()