commit 944266929aa35858537e3505fcc0226b74981649
author Fyodor Kyslov <kyslov@google.com> Thu Aug 29 10:41:55 2019 -0700
committer Fyodor Kyslov <kyslov@google.com> Thu Aug 29 10:56:28 2019 -0700
tree e457837d4b03376cecf977ce4752b89d184280d0
parent 8f18bdf4d098226307ba0d1a38121c8b6034af8d

AV1 RT: Filter search clean-up

Change-Id: I7dd938679829fe717700c19b7ea818b4557c6d28

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 215f110..cbe69be 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1154,6 +1154,7 @@
   return force_skip_low_temp_var;
 }
 
+#define FILTER_SEARCH_SIZE 2
 static void search_filter_ref(AV1_COMP *cpi, MACROBLOCK *x, RD_STATS *this_rdc,
                               int mi_row, int mi_col, BLOCK_SIZE bsize,
                               unsigned int *var_y, unsigned int *sse_y,
@@ -1162,21 +1163,22 @@
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mi = xd->mi[0];
 
-  int pf_rate[2] = { 0 };
-  int64_t pf_dist[2] = { 0 };
-  int curr_rate[2] = { 0 };
-  unsigned int pf_var[2] = { 0 };
-  unsigned int pf_sse[2] = { 0 };
-  TX_SIZE pf_tx_size[2] = { 0 };
-  int skip_txfm[2] = { 0 };
+  int pf_rate[FILTER_SEARCH_SIZE] = { 0 };
+  int64_t pf_dist[FILTER_SEARCH_SIZE] = { 0 };
+  int curr_rate[FILTER_SEARCH_SIZE] = { 0 };
+  unsigned int pf_var[FILTER_SEARCH_SIZE] = { 0 };
+  unsigned int pf_sse[FILTER_SEARCH_SIZE] = { 0 };
+  TX_SIZE pf_tx_size[FILTER_SEARCH_SIZE] = { 0 };
+  int skip_txfm[FILTER_SEARCH_SIZE] = { 0 };
   int best_skip = 0;
   int best_early_term = 0;
   int64_t best_cost = INT64_MAX;
 
   int best_filter_index = -1;
-  InterpFilter filters[2] = { EIGHTTAP_REGULAR, EIGHTTAP_SMOOTH };
+  InterpFilter filters[FILTER_SEARCH_SIZE] = { EIGHTTAP_REGULAR,
+                                               EIGHTTAP_SMOOTH };
   int i;
-  for (i = 0; i < 2; ++i) {
+  for (i = 0; i < FILTER_SEARCH_SIZE; ++i) {
     int64_t cost;
     InterpFilter filter = filters[i];
     mi->interp_filters = av1_broadcast_interp_filter(filter);
@@ -1199,7 +1201,7 @@
       best_early_term = *this_early_term;
     }
   }
-  assert(best_filter_index >= 0 && best_filter_index < 2);
+  assert(best_filter_index >= 0 && best_filter_index < FILTER_SEARCH_SIZE);
 
   mi->interp_filters = av1_broadcast_interp_filter(filters[best_filter_index]);
   mi->tx_size = pf_tx_size[best_filter_index];