Commit 468f229f authored by multrus's avatar multrus
Browse files

[cleanup] accept OPT_IVAS_FILTER_ROM

parent d9195677

lib_com/cldfb_fx.c

+0 −455

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

#define OPT_MCT_ENC_V3_BE

#define OPT_BIN_REND_V2_NBE

#define OPT_IVAS_FILTER_ROM                    /* Optimization made in IVAS filter table */

/* Both following 2 macros (IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST*) are independent from each other, they refer to different code blocks */

//#define IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE /* FhG: reduces WMOPS of param_mc_prm_est, not bit-exact to previous version. Obsoleted by MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE. */

//#define HARM_SCE_INIT

lib_com/rom_com.c

+0 −238

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/rom_com_fx.h

+0 −19
Original line number Diff line number Diff line
@@ -70,24 +70,6 @@ extern const Word16 sin_twiddle_table_25_5_5[25]; // Q15 
extern const Word16 cos_twiddle_table_16_8_2[16]; // Q15

extern const Word16 sin_twiddle_table_16_8_2[16]; // Q15



#ifndef OPT_IVAS_FILTER_ROM

extern const Word16 CLDFB80_10_fx[100]; // Q15

extern const Word16 CLDFB80_16_fx[160]; // Q15

extern const Word16 CLDFB80_20_fx[200]; // Q15

extern const Word16 CLDFB80_30_fx[300]; // Q15

extern const Word16 CLDFB80_32_fx[320]; // Q15

extern const Word16 CLDFB80_40_fx[400]; // Q15

extern const Word16 CLDFB80_60_fx[600]; // Q15



/*5ms delay*/

extern const Word16 LDQMF_10_fx[100]; // Q15

extern const Word16 LDQMF_16_fx[160]; // Q15

extern const Word16 LDQMF_20_fx[200]; // Q15

extern const Word16 LDQMF_30_fx[300]; // Q15

extern const Word16 LDQMF_32_fx[320]; // Q15

extern const Word16 LDQMF_40_fx[400]; // Q15

extern const Word16 LDQMF_60_fx[600]; // Q15

#else                                 /* OPT_IVAS_FILTER_ROM */



extern const Word32 CLDFB80_10_fx[100]; // Q30

extern const Word32 CLDFB80_16_fx[160]; // Q30
@@ -105,7 +87,6 @@ extern const Word32 LDQMF_30_fx[300]; // Q30 
extern const Word32 LDQMF_32_fx[320]; // Q30

extern const Word32 LDQMF_40_fx[400]; // Q30

extern const Word32 LDQMF_60_fx[600]; // Q30

#endif                                /* OPT_IVAS_FILTER_ROM */

/* Not used anywhere

extern const Word16 LDQMF_10_enc_fx[100];

extern const Word16 LDQMF_16_enc_fx[160];

lib_com/stat_com.h

+0 −4
Original line number Diff line number Diff line
@@ -619,11 +619,7 @@ typedef struct cldfb_filter_bank_struct 
    Word16 da; /* delay analysis */

    CLDFB_PROTOTYPE prototype;

    const Word16 *p_filter; /*!< Pointer to filter coefficients */ // Q15

#ifdef OPT_IVAS_FILTER_ROM

    const Word32 *p_filter_32; /*!< Pointer to filter coefficients */ // Q15

#else                                                                 /* OPT_IVAS_FILTER_ROM */

    Word16 p_filter_sf; // Q0

#endif                                                                /* OPT_IVAS_FILTER_ROM */



    /* rotation vectors */

    const Word32 *rot_vec_syn_re_fx; // Q29