Commit b60ccf57 authored by mave2802's avatar mave2802
Browse files

fixed rebase conflicts

parent 5254a6d2

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -133,11 +133,7 @@ 


/* #################### Start BASOP optimization switches ############################ */



#define OPT_2181_MATRIX_TRANSP_1_MUL        /* Dolby: Issue 2181, optimize matrixTransp1Mul_fx. */

#define OPT_2182_MATRIX_SCALE_OPS           /* Dolby: Issue 2181, move matrix scale operations outside mul operations. */

#define OPT_2185_MATRIX_OUT_SCALING         /* Dolby: Issue 2185, optimize matrix-mul output-format. */

#define NONBE_OPT_2239_IVAS_FILTER_PROCESS  /* Dolby: Issue 2239, optimize ivas_filter_process_fx. */

#define NONBE_OPT_2193_EIG2X2               /* Dolby: Issue 2193, optimize eig2x2_fx. */

#define BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST /* FhG: Speeds up covariance calculation e.g. 60 WMOPS for encoding -mc 7_1_4 24400 48 */

#define NONBE_2169_BINAURAL_MIXING_MATRIX_OPT               /* Dolby: use optimized formulate2x2MixingMatrix() function and subfunctions */

/* #################### End BASOP optimization switches ############################ */