commit 4a17335c1d91690bb72c44a259328c84f5904e62
author Jingning Han <jingning@google.com> Thu Mar 01 17:54:07 2018 -0800
committer Jingning Han <jingning@google.com> Fri Mar 02 15:35:12 2018 +0000
tree 723192c484d0823e6dcb8d7cdcdda02a5980cd82
parent 4d37568b39c3fb7e5417e0ec05931f9374540fd8

Remove mv dependency conditions on filter type coding

The final design plan would code the inter prediction filter type
regardless of the motion vector sub pixel conditions. Remove the
unnecessary condition checks in the bit-stream writing and reading.
This is not a normative change.

Change-Id: I12d4e5a5740c0337912c7c543cdadfe0aef56285

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7aea432..1193c5b 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -658,19 +658,12 @@
   if (cm->interp_filter == SWITCHABLE) {
     int dir;
     for (dir = 0; dir < 2; ++dir) {
-      if (has_subpel_mv_component(xd->mi[0], xd, dir) ||
-          (mbmi->ref_frame[1] > INTRA_FRAME &&
-           has_subpel_mv_component(xd->mi[0], xd, dir + 2))) {
-        const int ctx = av1_get_pred_context_switchable_interp(xd, dir);
-        InterpFilter filter =
-            av1_extract_interp_filter(mbmi->interp_filters, dir);
-        aom_write_symbol(w, filter, ec_ctx->switchable_interp_cdf[ctx],
-                         SWITCHABLE_FILTERS);
-        ++cpi->interp_filter_selected[0][filter];
-      } else {
-        assert(av1_extract_interp_filter(mbmi->interp_filters, dir) ==
-               EIGHTTAP_REGULAR);
-      }
+      const int ctx = av1_get_pred_context_switchable_interp(xd, dir);
+      InterpFilter filter =
+          av1_extract_interp_filter(mbmi->interp_filters, dir);
+      aom_write_symbol(w, filter, ec_ctx->switchable_interp_cdf[ctx],
+                       SWITCHABLE_FILTERS);
+      ++cpi->interp_filter_selected[0][filter];
       if (cm->seq_params.enable_dual_filter == 0) return;
     }
   }