Commit 5a338ee4 authored by Jingning Han's avatar Jingning Han

Fix compiler errors in cfl.h

Change-Id: Iadf001ae293ca50b805e8b8c569900f60a23943c
parent 3f0f1dfc
......@@ -110,7 +110,6 @@ static INLINE void cfl_subtract_average_null(int16_t *pred_buf_q3) {
num_pel_log2); \
}
#if CONFIG_TX64X64
#define CFL_SUB_AVG_FN(arch) \
CFL_SUB_AVG_X(arch, 4, 4, 8, 4) \
CFL_SUB_AVG_X(arch, 4, 8, 16, 5) \
......@@ -152,29 +151,5 @@ static INLINE void cfl_subtract_average_null(int16_t *pred_buf_q3) {
/* index the function pointer array out of bounds. */ \
return sub_avg[tx_size % TX_SIZES_ALL]; \
}
#else
#define CFL_SUB_AVG_FN(arch) \
cfl_subtract_average_fn get_subtract_average_fn_##arch(TX_SIZE tx_size) { \
static const cfl_subtract_average_fn sub_avg[TX_SIZES_ALL] = { \
subtract_average_4x4_x, /* 4x4 */ \
subtract_average_8x8_x, /* 8x8 */ \
subtract_average_16x16_x, /* 16x16 */ \
subtract_average_32x32_x, /* 32x32 */ \
subtract_average_4x8_x, /* 4x8 */ \
subtract_average_8x4_x, /* 8x4 */ \
subtract_average_8x16_x, /* 8x16 */ \
subtract_average_16x8_x, /* 16x8 */ \
subtract_average_16x32_x, /* 16x32 */ \
subtract_average_32x16_x, /* 32x16 */ \
subtract_average_4x16_x, /* 4x16 (invalid CFL size) */ \
subtract_average_16x4_x, /* 16x4 (invalid CFL size) */ \
subtract_average_8x32_x, /* 8x32 (invalid CFL size) */ \
subtract_average_32x8_x, /* 32x8 (invalid CFL size) */ \
}; \
/* Modulo TX_SIZES_ALL to ensure that an attacker won't be able to */ \
/* index the function pointer array out of bounds. */ \
return sub_avg[tx_size % TX_SIZES_ALL]; \
}
#endif
#endif // AV1_COMMON_CFL_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment