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/test/av1_convolve_optimz_test.cc b/test/av1_convolve_optimz_test.cc
index 11ca48c..a2923dd 100644
--- a/test/av1_convolve_optimz_test.cc
+++ b/test/av1_convolve_optimz_test.cc
@@ -34,14 +34,14 @@
// <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 @@
};
// 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 af15cef..435e106 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -32,12 +32,12 @@
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_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_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_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_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 @@
#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 @@
#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 3bbbe95..2610264 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -636,7 +636,7 @@
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 @@
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 @@
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 @@
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],
