commit 38edf6898868c9012b2af4a9ee5808263c513b3e
author Angie Chiang <angiebird@google.com> Tue Feb 21 15:13:09 2017 -0800
committer Angie Chiang <angiebird@google.com> Wed Feb 22 01:22:34 2017 +0000
tree 367c45afe93e7ab37bdd6e07e6a7ea3ee53e6327
parent 97d102eaff5dcb87743d407e362c4e0a80be4b01

Simplify write_mb_interp_filter code flow

Removing av1_is_interp_needed() function from it.
Use has_subpel_mv_component() only.

Change-Id: I98b674b28c276a09bb94f24d66360d24377066a8

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 80b0a95..6506dc0 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1182,11 +1182,6 @@
   if (cm->interp_filter == SWITCHABLE) {
 #if CONFIG_DUAL_FILTER
     int dir;
-    if (!av1_is_interp_needed(xd)) {
-      assert(mbmi->interp_filter[0] == EIGHTTAP_REGULAR);
-      return;
-    }
-
     for (dir = 0; dir < 2; ++dir) {
       if (has_subpel_mv_component(xd->mi[0], xd, dir) ||
           (mbmi->ref_frame[1] > INTRA_FRAME &&
@@ -1202,6 +1197,8 @@
                         &switchable_interp_encodings[mbmi->interp_filter[dir]]);
 #endif
         ++cpi->interp_filter_selected[0][mbmi->interp_filter[dir]];
+      } else {
+        assert(mbmi->interp_filter[dir] == EIGHTTAP_REGULAR);
       }
     }
 #else
@@ -1980,8 +1977,8 @@
         xd->left_txfm_context_buffer + (mi_row & MAX_MIB_MASK);
 #endif
 #if CONFIG_DUAL_FILTER
-    // av1_is_interp_needed needs the ref frame buffers set up to look
-    // up if they are scaled. av1_is_interp_needed is in turn needed by
+    // has_subpel_mv_component needs the ref frame buffers set up to look
+    // up if they are scaled. has_subpel_mv_component is in turn needed by
     // write_switchable_interp_filter, which is called by pack_inter_mode_mvs.
     set_ref_ptrs(cm, xd, m->mbmi.ref_frame[0], m->mbmi.ref_frame[1]);
 #endif  // CONFIG_DUAL_FILTER