commit bab2912b5ec4381394974395c007a0bba2360295
author Debargha Mukherjee <debargha@google.com> Fri Feb 26 00:18:03 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Feb 26 15:42:49 2016 -0800
tree fa60f4d18835d025091f25f13afcd835bba0bba2
parent 2b7196a8bb52739e19567e76f0ebf9ecd81ca250

Some refactoring and cleanups of interp filter

Includes various cosmetic changes and refactoring including
naming the sharp filters differently (since they are no longer
8-tap).

Change-Id: Ida5a19ca0daa9f6a64a6734394c685b2a4a2564a

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 8be078f..d26b687 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -4407,7 +4407,7 @@
 #else
             this_mode == NEWMV &&
 #endif  // CONFIG_EXT_INTER
-            mbmi->interp_filter == EIGHTTAP) {
+            mbmi->interp_filter == EIGHTTAP_REGULAR) {
           // adjust src pointers
           mi_buf_shift(x, i);
           if (cpi->sf.comp_inter_joint_search_thresh <= bsize) {
@@ -5133,11 +5133,11 @@
   }
   if (cm->interp_filter != BILINEAR) {
     if (x->source_variance < cpi->sf.disable_filter_search_var_thresh) {
-      best_filter = EIGHTTAP;
+      best_filter = EIGHTTAP_REGULAR;
     }
 #if CONFIG_EXT_INTERP
     else if (!vp10_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE) {
-      best_filter = EIGHTTAP;
+      best_filter = EIGHTTAP_REGULAR;
     }
 #endif
   }
@@ -6775,7 +6775,7 @@
 #endif  // CONFIG_EXT_INTRA
     // Evaluate all sub-pel filters irrespective of whether we can use
     // them for this frame.
-    mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP
+    mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR
                                                           : cm->interp_filter;
     mbmi->mv[0].as_int = mbmi->mv[1].as_int = 0;
 #if CONFIG_OBMC
@@ -7576,7 +7576,7 @@
   x->skip = 1;
 
   if (cm->interp_filter != BILINEAR) {
-    best_filter = EIGHTTAP;
+    best_filter = EIGHTTAP_REGULAR;
     if (cm->interp_filter == SWITCHABLE &&
 #if CONFIG_EXT_INTERP
         vp10_is_interp_needed(xd) &&
@@ -7919,7 +7919,7 @@
     mbmi->ref_frame[1] = second_ref_frame;
     // Evaluate all sub-pel filters irrespective of whether we can use
     // them for this frame.
-    mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP
+    mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? EIGHTTAP_REGULAR
                                                           : cm->interp_filter;
     x->skip = 0;
     set_ref_ptrs(cm, xd, ref_frame, second_ref_frame);
@@ -8003,9 +8003,9 @@
       mbmi->tx_type = DCT_DCT;
 
       if (cm->interp_filter != BILINEAR) {
-        tmp_best_filter = EIGHTTAP;
+        tmp_best_filter = EIGHTTAP_REGULAR;
         if (x->source_variance < sf->disable_filter_search_var_thresh) {
-          tmp_best_filter = EIGHTTAP;
+          tmp_best_filter = EIGHTTAP_REGULAR;
         } else if (sf->adaptive_pred_interp_filter == 1 &&
                    ctx->pred_interp_filter < SWITCHABLE) {
           tmp_best_filter = ctx->pred_interp_filter;
@@ -8033,7 +8033,7 @@
                                               mi_row, mi_col);
 #if CONFIG_EXT_INTERP
             if (!vp10_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE &&
-                mbmi->interp_filter != EIGHTTAP)  // invalid configuration
+                mbmi->interp_filter != EIGHTTAP_REGULAR)  // invalid config
               continue;
 #endif  // CONFIG_EXT_INTERP
             if (tmp_rd == INT64_MAX)
@@ -8105,8 +8105,8 @@
                                           mi_row, mi_col);
 #if CONFIG_EXT_INTERP
         if (!vp10_is_interp_needed(xd) && cm->interp_filter == SWITCHABLE &&
-            mbmi->interp_filter != EIGHTTAP) {
-          mbmi->interp_filter = EIGHTTAP;
+            mbmi->interp_filter != EIGHTTAP_REGULAR) {
+          mbmi->interp_filter = EIGHTTAP_REGULAR;
           tmp_rd = rd_pick_best_sub8x8_mode(cpi, x,
                    &x->mbmi_ext->ref_mvs[ref_frame][0],
                    second_ref, best_yrd, &rate, &rate_y,