diff --git a/av1/common/av1_convolve.c b/av1/common/av1_convolve.c
index dec67597ce8e2ea2bb3fd9eab6598bcebfcab7f2..1f8d623548b246674fab6b01723e0f6b9f53e107 100644
--- a/av1/common/av1_convolve.c
+++ b/av1/common/av1_convolve.c
@@ -96,9 +96,9 @@ static void convolve_copy(const uint8_t *src, int src_stride, uint8_t *dst,
void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
const int subpel_x_q4, int x_step_q4, const int subpel_y_q4,
int y_step_q4, int ref_idx) {
@@ -270,9 +270,9 @@ static void highbd_convolve_copy(const uint16_t *src, int src_stride,
void av1_highbd_convolve(const uint8_t *src8, int src_stride, uint8_t *dst8,
int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
const int subpel_x_q4, int x_step_q4,
const int subpel_y_q4, int y_step_q4, int ref_idx,
diff --git a/av1/common/av1_convolve.h b/av1/common/av1_convolve.h
index f082a8ac852fd293b00a6c4796ffc0e6d7f7fd51..804c1024c49abcac1f79e2d0c9808bc0ac7f4f9c 100644
--- a/av1/common/av1_convolve.h
+++ b/av1/common/av1_convolve.h
@@ -9,9 +9,9 @@ extern "C" {
void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
const int subpel_x, int xstep, const int subpel_y, int ystep,
int avg);
@@ -20,9 +20,9 @@ void av1_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
void av1_highbd_convolve(const uint8_t *src, int src_stride, uint8_t *dst,
int dst_stride, int w, int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
const int subpel_x, int xstep, const int subpel_y,
int ystep, int avg, int bd);
diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index f035bb5a41646283d2b35034c1235e2d99cb8daf..f9f82e1ff5535f0e8b361bf5e6023c6c50005d63 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -203,9 +203,9 @@ typedef struct {
// Only for INTER blocks
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4];
+ InterpFilter interp_filter[4];
#else
- INTERP_FILTER interp_filter;
+ InterpFilter interp_filter;
#endif
MV_REFERENCE_FRAME ref_frame[2];
TX_TYPE tx_type;
diff --git a/av1/common/filter.c b/av1/common/filter.c
index 3960ab4082006046d5c2bf8b27c55f66844e090e..544e3da7ee4a4d14102f2ed8ce88eedaba7a309d 100644
--- a/av1/common/filter.c
+++ b/av1/common/filter.c
@@ -222,7 +222,7 @@ static const InterpFilterParams av1_interp_temporalfilter_12tap = {
#endif // USE_TEMPORALFILTER_12TAP
InterpFilterParams av1_get_interp_filter_params(
- const INTERP_FILTER interp_filter) {
+ const InterpFilter interp_filter) {
#if USE_TEMPORALFILTER_12TAP
if (interp_filter == TEMPORALFILTER_12TAP)
return av1_interp_temporalfilter_12tap;
@@ -230,7 +230,7 @@ InterpFilterParams av1_get_interp_filter_params(
return av1_interp_filter_params_list[interp_filter];
}
-const int16_t *av1_get_interp_filter_kernel(const INTERP_FILTER interp_filter) {
+const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter) {
#if USE_TEMPORALFILTER_12TAP
if (interp_filter == TEMPORALFILTER_12TAP)
return av1_interp_temporalfilter_12tap.filter_ptr;
diff --git a/av1/common/filter.h b/av1/common/filter.h
index c757e0e9215cd7be5c8eec684a7e137840409832..8b3aaa3cd64b98d8a87ce363bdb31b874f5d31bd 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -55,7 +55,7 @@ extern "C" {
#define SWITCHABLE_FILTER_CONTEXTS (SWITCHABLE_FILTERS + 1)
#endif
-typedef uint8_t INTERP_FILTER;
+typedef uint8_t InterpFilter;
#if CONFIG_EXT_INTRA
typedef enum {
@@ -76,9 +76,9 @@ typedef struct InterpFilterParams {
} InterpFilterParams;
InterpFilterParams av1_get_interp_filter_params(
- const INTERP_FILTER interp_filter);
+ const InterpFilter interp_filter);
-const int16_t *av1_get_interp_filter_kernel(const INTERP_FILTER interp_filter);
+const int16_t *av1_get_interp_filter_kernel(const InterpFilter interp_filter);
static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
const InterpFilterParams filter_params, const int subpel) {
@@ -86,7 +86,7 @@ static INLINE const int16_t *av1_get_interp_filter_subpel_kernel(
}
static INLINE int av1_is_interpolating_filter(
- const INTERP_FILTER interp_filter) {
+ const InterpFilter interp_filter) {
const InterpFilterParams ip = av1_get_interp_filter_params(interp_filter);
return (ip.filter_ptr[ip.taps / 2 - 1] == 128);
}
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index e2bd21802408f7bb4d9c65e2b76f549e2ee693e0..a14b34f5ce47c4203785af49dfadac889ff93152 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -271,7 +271,7 @@ typedef struct AV1Common {
uint8_t *current_frame_seg_map;
int seg_map_alloc_size;
- INTERP_FILTER interp_filter;
+ InterpFilter interp_filter;
loop_filter_info_n lf_info;
#if CONFIG_LOOP_RESTORATION
diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c
index 6fe11880e5f46abec8c5f584a3fbe79be181935f..5d8cad0e23d3a1f239c2a0bd52a91beacc5742b7 100644
--- a/av1/common/pred_common.c
+++ b/av1/common/pred_common.c
@@ -16,10 +16,10 @@
// Returns a context number for the given MB prediction signal
#if CONFIG_DUAL_FILTER
-static INTERP_FILTER get_ref_filter_type(const MODE_INFO *mi,
- const MACROBLOCKD *xd, int dir,
- MV_REFERENCE_FRAME ref_frame) {
- INTERP_FILTER ref_type = SWITCHABLE_FILTERS;
+static InterpFilter get_ref_filter_type(const MODE_INFO *mi,
+ const MACROBLOCKD *xd, int dir,
+ MV_REFERENCE_FRAME ref_frame) {
+ InterpFilter ref_type = SWITCHABLE_FILTERS;
const MB_MODE_INFO *ref_mbmi = &mi->mbmi;
int use_subpel[2] = {
has_subpel_mv_component(mi, xd, dir),
diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 6a28161ae87684a65d90f1fb3067544f2823f92f..a16f7ef04692e68fa5daa013ad7a037916788798 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -418,9 +418,9 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
const struct scale_factors *sf, int w,
int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
int xs, int ys,
#if CONFIG_SUPERTX
@@ -431,11 +431,11 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
// The prediction filter types used here should be those for
// the second reference block.
#if CONFIG_DUAL_FILTER
- INTERP_FILTER tmp_ipf[4] = {
+ InterpFilter tmp_ipf[4] = {
interp_filter[2], interp_filter[3], interp_filter[2], interp_filter[3],
};
#else
- INTERP_FILTER tmp_ipf = interp_filter;
+ InterpFilter tmp_ipf = interp_filter;
#endif // CONFIG_DUAL_FILTER
#if CONFIG_AOM_HIGHBITDEPTH
DECLARE_ALIGNED(16, uint8_t, tmp_dst_[2 * MAX_SB_SQUARE]);
@@ -491,9 +491,9 @@ void av1_highbd_build_inter_predictor(
const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
const MV *src_mv, const struct scale_factors *sf, int w, int h, int ref,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
enum mv_precision precision, int x, int y, int bd) {
const int is_q4 = precision == MV_PRECISION_Q4;
@@ -516,9 +516,9 @@ void av1_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
const struct scale_factors *sf, int w, int h,
int ref,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
enum mv_precision precision, int x, int y) {
const int is_q4 = precision == MV_PRECISION_Q4;
diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index 379ba516cbd6982528321ab91ee12b3f875daf71..26a4590c727afc7c499a061d0c90e5199e80afe4 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -27,9 +27,9 @@ static INLINE void inter_predictor(const uint8_t *src, int src_stride,
const struct scale_factors *sf, int w, int h,
int ref_idx,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
int xs, int ys) {
#if CONFIG_DUAL_FILTER
@@ -86,9 +86,9 @@ static INLINE void highbd_inter_predictor(const uint8_t *src, int src_stride,
const struct scale_factors *sf, int w,
int h, int ref,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
int xs, int ys, int bd) {
#if CONFIG_DUAL_FILTER
@@ -229,9 +229,9 @@ static INLINE void av1_make_inter_predictor(
const int subpel_x, const int subpel_y, const struct scale_factors *sf,
int w, int h, int ref,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
int xs, int ys, const MACROBLOCKD *xd) {
(void)xd;
@@ -252,9 +252,9 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
const struct scale_factors *sf, int w,
int h,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
int xs, int ys,
#if CONFIG_SUPERTX
@@ -371,9 +371,9 @@ void av1_build_inter_predictor(const uint8_t *src, int src_stride, uint8_t *dst,
const struct scale_factors *sf, int w, int h,
int do_avg,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
enum mv_precision precision, int x, int y);
@@ -382,9 +382,9 @@ void av1_highbd_build_inter_predictor(
const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride,
const MV *mv_q3, const struct scale_factors *sf, int w, int h, int do_avg,
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER *interp_filter,
+ const InterpFilter *interp_filter,
#else
- const INTERP_FILTER interp_filter,
+ const InterpFilter interp_filter,
#endif
enum mv_precision precision, int x, int y, int bd);
#endif
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 8d3202c51fe2bfb12b546252a11c5668c15b5151..6e52c79d947ab8e82f2b6c700562bb3cc6446874 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2108,7 +2108,7 @@ static void setup_segmentation_dequant(AV1_COMMON *const cm) {
}
}
-static INTERP_FILTER read_interp_filter(struct aom_read_bit_buffer *rb) {
+static InterpFilter read_interp_filter(struct aom_read_bit_buffer *rb) {
return aom_rb_read_bit(rb) ? SWITCHABLE
: aom_rb_read_literal(rb, 2 + CONFIG_EXT_INTERP);
}
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 535c5b5492679432263c5715eb14ab8042603544..290f6c1995422089ebfa574279e0fb213ec41021 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -862,12 +862,12 @@ static MOTION_VARIATION read_motvar_block(AV1_COMMON *const cm,
}
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
-static INLINE INTERP_FILTER read_interp_filter(AV1_COMMON *const cm,
- MACROBLOCKD *const xd,
+static INLINE InterpFilter read_interp_filter(AV1_COMMON *const cm,
+ MACROBLOCKD *const xd,
#if CONFIG_DUAL_FILTER
- int dir,
+ int dir,
#endif
- aom_reader *r) {
+ aom_reader *r) {
#if CONFIG_EXT_INTERP
if (!av1_is_interp_needed(xd)) return EIGHTTAP_REGULAR;
#endif
@@ -880,7 +880,7 @@ static INLINE INTERP_FILTER read_interp_filter(AV1_COMMON *const cm,
const int ctx = av1_get_pred_context_switchable_interp(xd);
#endif
FRAME_COUNTS *counts = xd->counts;
- const INTERP_FILTER type = (INTERP_FILTER)aom_read_tree(
+ const InterpFilter type = (InterpFilter)aom_read_tree(
r, av1_switchable_interp_tree, cm->fc->switchable_interp_prob[ctx]);
if (counts) ++counts->switchable_interp[ctx][type];
return type;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7c33aea80939dde745b4b1336ce93adea6f10ac9..49f1b44c38e12ad2c9dd3920b4df953e0bdec675 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2624,7 +2624,7 @@ static void update_txfm_probs(AV1_COMMON *cm, aom_writer *w,
}
}
-static void write_interp_filter(INTERP_FILTER filter,
+static void write_interp_filter(InterpFilter filter,
struct aom_write_bit_buffer *wb) {
aom_wb_write_bit(wb, filter == SWITCHABLE);
if (filter != SWITCHABLE)
diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index c77eb245e9bfecf47c2498227f28b31fbd2ca372..c798cdfb45b80f5777482111c7dfd8d75db282a5 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -58,7 +58,7 @@ typedef struct {
// motion vector cache for adaptive motion search control in partition
// search loop
MV pred_mv[TOTAL_REFS_PER_FRAME];
- INTERP_FILTER pred_interp_filter;
+ InterpFilter pred_interp_filter;
#if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition;
#endif
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 65e1f3c209adcb3bcfa86c960dbff1cbe430f3ab..3e9e2c2db701c5c2e42610f3d7652458dc99edab 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4429,7 +4429,7 @@ static void set_arf_sign_bias(AV1_COMP *cpi) {
}
static int setup_interp_filter_search_mask(AV1_COMP *cpi) {
- INTERP_FILTER ifilter;
+ InterpFilter ifilter;
int ref_total[TOTAL_REFS_PER_FRAME] = { 0 };
MV_REFERENCE_FRAME ref;
int mask = 0;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f27a100947b453442675ee6de27b2489689d3a02..0632693249bca2a154dcd04499fa93022b4e6022 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4569,12 +4569,12 @@ static void joint_motion_search(AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
int_mv ref_mv[2];
int ite, ref;
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = {
+ InterpFilter interp_filter[4] = {
mbmi->interp_filter[0], mbmi->interp_filter[1], mbmi->interp_filter[2],
mbmi->interp_filter[3],
};
#else
- const INTERP_FILTER interp_filter = mbmi->interp_filter;
+ const InterpFilter interp_filter = mbmi->interp_filter;
#endif
struct scale_factors sf;
@@ -6335,11 +6335,11 @@ static int estimate_wedge_sign(const AV1_COMP *cpi, const MACROBLOCK *x,
#endif // CONFIG_EXT_INTER
#if !CONFIG_DUAL_FILTER
-static INTERP_FILTER predict_interp_filter(
+static InterpFilter predict_interp_filter(
const AV1_COMP *cpi, const MACROBLOCK *x, const BLOCK_SIZE bsize,
const int mi_row, const int mi_col,
- INTERP_FILTER (*single_filter)[TOTAL_REFS_PER_FRAME]) {
- INTERP_FILTER best_filter = SWITCHABLE;
+ InterpFilter (*single_filter)[TOTAL_REFS_PER_FRAME]) {
+ InterpFilter best_filter = SWITCHABLE;
const AV1_COMMON *cm = &cpi->common;
const MACROBLOCKD *xd = &x->e_mbd;
int bsl = mi_width_log2_lookup[bsize];
@@ -6359,7 +6359,7 @@ static INTERP_FILTER predict_interp_filter(
return SWITCHABLE;
#else
if (pred_filter_search) {
- INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;
+ InterpFilter af = SWITCHABLE, lf = SWITCHABLE;
if (xd->up_available) af = xd->mi[-xd->mi_stride]->mbmi.interp_filter;
if (xd->left_available) lf = xd->mi[-1]->mbmi.interp_filter;
@@ -6647,7 +6647,7 @@ static int64_t handle_inter_mode(
#else
int_mv single_newmv[TOTAL_REFS_PER_FRAME],
#endif // CONFIG_EXT_INTER
- INTERP_FILTER (*single_filter)[TOTAL_REFS_PER_FRAME],
+ InterpFilter (*single_filter)[TOTAL_REFS_PER_FRAME],
int (*single_skippable)[TOTAL_REFS_PER_FRAME], int64_t *psse,
const int64_t ref_best_rd) {
AV1_COMMON *cm = &cpi->common;
@@ -6712,11 +6712,11 @@ static int64_t handle_inter_mode(
// Index use case:
// {0, 1} -> (vertical, horizontal) filter types for the first ref frame
// {2, 3} -> (vertical, horizontal) filter types for the second ref frame
- INTERP_FILTER best_filter[4] = {
+ InterpFilter best_filter[4] = {
SWITCHABLE, SWITCHABLE, SWITCHABLE, SWITCHABLE,
};
#else
- INTERP_FILTER best_filter = SWITCHABLE;
+ InterpFilter best_filter = SWITCHABLE;
#endif
int skip_txfm_sb = 0;
@@ -7510,12 +7510,12 @@ static int64_t handle_inter_mode(
#endif // CONFIG_EXT_INTER
#if CONFIG_EXT_INTERP
#if CONFIG_DUAL_FILTER
- INTERP_FILTER obmc_interp_filter[2][2] = {
+ InterpFilter obmc_interp_filter[2][2] = {
{ mbmi->interp_filter[0], mbmi->interp_filter[1] }, // obmc == 0
{ mbmi->interp_filter[0], mbmi->interp_filter[1] } // obmc == 1
};
#else
- INTERP_FILTER obmc_interp_filter[2] = {
+ InterpFilter obmc_interp_filter[2] = {
mbmi->interp_filter, // obmc == 0
mbmi->interp_filter // obmc == 1
};
@@ -8193,7 +8193,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
#else
int_mv single_newmv[TOTAL_REFS_PER_FRAME] = { { 0 } };
#endif // CONFIG_EXT_INTER
- INTERP_FILTER single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME];
+ InterpFilter single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME];
int single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME];
static const int flag_list[TOTAL_REFS_PER_FRAME] = {
0,
@@ -8982,10 +8982,9 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
clamp_mv2(&cur_mv.as_mv, xd);
if (!mv_check_bounds(x, &cur_mv.as_mv)) {
- INTERP_FILTER
- dummy_single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] = {
- { 0 }
- };
+ InterpFilter
+ dummy_single_inter_filter[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] =
+ { { 0 } };
int dummy_single_skippable[MB_MODE_COUNT][TOTAL_REFS_PER_FRAME] = {
{ 0 }
};
@@ -9763,7 +9762,7 @@ void av1_rd_pick_inter_mode_sb_seg_skip(AV1_COMP *cpi, TileDataEnc *tile_data,
unsigned int ref_costs_single[TOTAL_REFS_PER_FRAME];
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
aom_prob comp_mode_p;
- INTERP_FILTER best_filter = SWITCHABLE;
+ InterpFilter best_filter = SWITCHABLE;
int64_t this_rd = INT64_MAX;
int rate2 = 0;
const int64_t distortion2 = 0;
@@ -9923,9 +9922,9 @@ void av1_rd_pick_inter_mode_sub8x8(struct AV1_COMP *cpi, TileDataEnc *tile_data,
unsigned int ref_costs_comp[TOTAL_REFS_PER_FRAME];
aom_prob comp_mode_p;
#if CONFIG_DUAL_FILTER
- INTERP_FILTER tmp_best_filter[4] = { 0 };
+ InterpFilter tmp_best_filter[4] = { 0 };
#else
- INTERP_FILTER tmp_best_filter = SWITCHABLE;
+ InterpFilter tmp_best_filter = SWITCHABLE;
#endif
int rate_uv_intra, rate_uv_tokenonly;
int64_t dist_uv;
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 20296c4edf3fe32cf9a6241173efa5651d9bcd10..a6a4278e55318861459cdf82aa79537b56e6e1d8 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -453,7 +453,7 @@ typedef struct SPEED_FEATURES {
int encode_breakout_thresh;
// default interp filter choice
- INTERP_FILTER default_interp_filter;
+ InterpFilter default_interp_filter;
// Early termination in transform size search, which only applies while
// tx_size_search_method is USE_FULL_RD.
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 4ac47b9d93789ee2000d413a3e5460b3e37f89db..909d539285a072a2b3d043ec483b72e1e7f48990 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -42,16 +42,16 @@ static void temporal_filter_predictors_mb_c(
#if USE_TEMPORALFILTER_12TAP
#if CONFIG_DUAL_FILTER
- const INTERP_FILTER interp_filter[4] = { TEMPORALFILTER_12TAP,
- TEMPORALFILTER_12TAP,
- TEMPORALFILTER_12TAP,
- TEMPORALFILTER_12TAP };
+ const InterpFilter interp_filter[4] = { TEMPORALFILTER_12TAP,
+ TEMPORALFILTER_12TAP,
+ TEMPORALFILTER_12TAP,
+ TEMPORALFILTER_12TAP };
#else
- const INTERP_FILTER interp_filter = TEMPORALFILTER_12TAP;
+ const InterpFilter interp_filter = TEMPORALFILTER_12TAP;
#endif
(void)xd;
#else
- const INTERP_FILTER interp_filter = xd->mi[0]->mbmi.interp_filter;
+ const InterpFilter interp_filter = xd->mi[0]->mbmi.interp_filter;
#endif // USE_TEMPORALFILTER_12TAP
if (uv_block_width == 8) {
diff --git a/test/av1_convolve_optimz_test.cc b/test/av1_convolve_optimz_test.cc
index 11ca48c67f41df007858e0a7e581d18fe4e0568f..a2923dd50771f5687cd3156fec53c3e3edeb3875 100644
--- a/test/av1_convolve_optimz_test.cc
+++ b/test/av1_convolve_optimz_test.cc
@@ -34,14 +34,14 @@ typedef void (*hbd_conv_filter_t)(const uint16_t *, int, uint16_t *, int, int,
// <convolve_horiz_func, convolve_vert_func,
// <width, height>, filter_params, subpel_x_q4, avg>
typedef tuple<int, int> BlockDimension;
-typedef tuple<conv_filter_t, conv_filter_t, BlockDimension, INTERP_FILTER, int,
+typedef tuple<conv_filter_t, conv_filter_t, BlockDimension, InterpFilter, int,
int> ConvParams;
#if CONFIG_AOM_HIGHBITDEPTH
// Test parameter list:
// <convolve_horiz_func, convolve_vert_func,
// <width, height>, filter_params, subpel_x_q4, avg, bit_dpeth>
typedef tuple<hbd_conv_filter_t, hbd_conv_filter_t, BlockDimension,
- INTERP_FILTER, int, int, int> HbdConvParams;
+ InterpFilter, int, int, int> HbdConvParams;
#endif
// Note:
@@ -211,7 +211,7 @@ const BlockDimension kBlockDim[] = {
};
// 10/12-tap filters
-const INTERP_FILTER kFilter[] = { 6, 4, 2 };
+const InterpFilter kFilter[] = { 6, 4, 2 };
const int kSubpelQ4[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index af15cefc79ecd3396bc06d1b3fb42838e59180b7..435e106f40634cce3b11d17de997b9103d874186 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -32,12 +32,12 @@ void setup_convolve() {
TEST(AV1ConvolveTest, av1_convolve8) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
- EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+ InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
+ EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]);
#else
- INTERP_FILTER interp_filter = EIGHTTAP_REGULAR;
+ InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter);
#endif
@@ -79,12 +79,12 @@ TEST(AV1ConvolveTest, av1_convolve8) {
TEST(AV1ConvolveTest, av1_convolve) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
- EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+ InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
+ EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]);
#else
- INTERP_FILTER interp_filter = EIGHTTAP_REGULAR;
+ InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter);
#endif
@@ -139,12 +139,12 @@ TEST(AV1ConvolveTest, av1_convolve) {
TEST(AV1ConvolveTest, av1_convolve_avg) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
- EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+ InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
+ EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]);
#else
- INTERP_FILTER interp_filter = EIGHTTAP_REGULAR;
+ InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter);
#endif
@@ -205,12 +205,12 @@ TEST(AV1ConvolveTest, av1_convolve_avg) {
TEST(AV1ConvolveTest, av1_highbd_convolve) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
- EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+ InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
+ EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]);
#else
- INTERP_FILTER interp_filter = EIGHTTAP_REGULAR;
+ InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter);
#endif
@@ -266,12 +266,12 @@ TEST(AV1ConvolveTest, av1_highbd_convolve) {
TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
#if CONFIG_DUAL_FILTER
- INTERP_FILTER interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
- EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
+ InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, EIGHTTAP_REGULAR,
+ EIGHTTAP_REGULAR, EIGHTTAP_REGULAR };
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter[0]);
#else
- INTERP_FILTER interp_filter = EIGHTTAP_REGULAR;
+ InterpFilter interp_filter = EIGHTTAP_REGULAR;
InterpFilterParams filter_params =
av1_get_interp_filter_params(interp_filter);
#endif
@@ -337,7 +337,7 @@ TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
#define highbd_convolve_speed(func, block_size, frame_size) \
TEST(AV1ConvolveTest, func##_speed_##block_size##_##frame_size) { \
ACMRandom rnd(ACMRandom::DeterministicSeed()); \
- INTERP_FILTER interp_filter = EIGHTTAP; \
+ InterpFilter interp_filter = EIGHTTAP; \
InterpFilterParams filter_params = \
av1_get_interp_filter_params(interp_filter); \
int filter_size = filter_params.tap; \
@@ -389,7 +389,7 @@ TEST(AV1ConvolveTest, av1_highbd_convolve_avg) {
#define lowbd_convolve_speed(func, block_size, frame_size) \
TEST(AV1ConvolveTest, func##_speed_l_##block_size##_##frame_size) { \
ACMRandom rnd(ACMRandom::DeterministicSeed()); \
- INTERP_FILTER interp_filter = EIGHTTAP; \
+ InterpFilter interp_filter = EIGHTTAP; \
InterpFilterParams filter_params = \
av1_get_interp_filter_params(interp_filter); \
int filter_size = filter_params.tap; \
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 3bbbe9513b95099b7fe3f7af809364557a87173e..26102649c27f7d6a62ab64e21bee327523c4e9a7 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -636,7 +636,7 @@ const int kNumFilters = 16;
TEST(ConvolveTest, FiltersWontSaturateWhenAddedPairwise) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters =
- av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)];
+ av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int i = 0; i < kNumFilters; i++) {
const int p0 = filters[i][0] + filters[i][1];
const int p1 = filters[i][2] + filters[i][3];
@@ -674,7 +674,7 @@ TEST_P(ConvolveTest, MatchesReferenceSubpixelFilter) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters =
- av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)];
+ av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -751,7 +751,7 @@ TEST_P(ConvolveTest, MatchesReferenceAveragingSubpixelFilter) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters =
- av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)];
+ av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
@@ -848,7 +848,7 @@ TEST_P(ConvolveTest, FilterExtremes) {
for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
const InterpKernel *filters =
- av1_filter_kernels[static_cast<INTERP_FILTER>(filter_bank)];
+ av1_filter_kernels[static_cast<InterpFilter>(filter_bank)];
for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) {
for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) {
wrapper_filter_block2d_8_c(in, kInputStride, filters[filter_x],