Commit ebe02e19 authored by vaillancour's avatar vaillancour
Browse files

activation of switches

parent 1ceb786f

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ 
#define TEST_HR

#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */



#if 0

//#define REUSE_EVS_ACELP

#define REUSE_EVS_ACELP

#define REUSE_EVS_ACELP_SHIFT

#define USE_UC_EVS   // works at 13.2, 16.4m 32, issues at 24.4

#if 1

#define REUSE_EVS_ACELP_TC

lib_enc/acelp_core_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ ivas_error acelp_core_enc_ivas_fx( 
         *---------------------------------------------------------------*/



        calc_residu_fx( st, inp, res_fx, Aq );

#if 0 // def REUSE_EVS_ACELP_SHIFT // This should be moved outside of ACELP

#if 1 // def REUSE_EVS_ACELP_SHIFT // This should be moved outside of ACELP

        {

            Word16 tmp, max;

            max = 0;

lib_enc/enc_uv_fx.c

+3 −1
Original line number Diff line number Diff line
@@ -273,7 +273,9 @@ void encod_unvoiced_fx( 
    Word16 y1[L_SUBFR];      /* Filtered adaptive excitation                   */

    Word16 code2[L_SUBFR];   /* Gaussian excitation                            */

    Word16 y22[L_SUBFR];     /* Filtered Gaussian excitation                   */

   // Word16 prm_t[2 * NPRM_DIV], *prm = prm_t;

#ifdef USE_UC_EVS

     Word16 prm_t[2 * NPRM_DIV], *prm = prm_t;

#endif

    const Word16 *p_Aw_fx, *p_Aq_fx; /* pointer to LP filter coeff. vector */

    Word32 norm_gain_code_fx;

    ACELP_config *acelp_cfg;