s/INTERP_FILTER/InterpFilter/
this matches style guidelines and stabilizes successive runs of
clang-format across the tree. remaining types should be address in
successive commits.
Change-Id: I6ad3f69cf0a22cb9a9b895b272195f891f71170f
diff --git a/av1/common/av1_convolve.c b/av1/common/av1_convolve.c
index dec6759..1f8d623 100644
--- a/av1/common/av1_convolve.c
+++ b/av1/common/av1_convolve.c
@@ -96,9 +96,9 @@
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 @@
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 f082a8a..804c102 100644
--- a/av1/common/av1_convolve.h
+++ b/av1/common/av1_convolve.h
@@ -9,9 +9,9 @@
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_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 f035bb5..f9f82e1 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -203,9 +203,9 @@
// 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 3960ab4..544e3da 100644
--- a/av1/common/filter.c
+++ b/av1/common/filter.c
@@ -222,7 +222,7 @@
#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 @@
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 c757e0e..8b3aaa3 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -55,7 +55,7 @@
#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 @@
} 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 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 e2bd218..a14b34f 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -271,7 +271,7 @@
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 6fe1188..5d8cad0 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 6a28161..a16f7ef 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -418,9 +418,9 @@
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 @@
// 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 @@
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 @@
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 379ba51..26a4590 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -27,9 +27,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
