commit 2225853fe18ddb07cc7ba07893d68c61ea841810
author Sachin Kumar Garg <sachin.kumargarg@ittiam.com> Tue Jun 18 16:45:06 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Jun 19 17:30:41 2019 +0000
tree 04c13d16d0ef11d45e55a28460b394adf9b95ab7
parent b2b76b772274aa65cc756bd1f0cdcf53e8716be5

Fix Interp filter initialization

Usage of InterpFilter and InterpFilters have been corrected
appropriately.

Change-Id: Id3c952556fd30d5fd7023b921085f52ba48a4772

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 5f1edb3..8463ba1 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -110,7 +110,7 @@
   bp->best_ref_frame = LAST_FRAME;
   bp->best_tx_size = TX_8X8;
   bp->best_intra_tx_size = TX_8X8;
-  bp->best_pred_filter = EIGHTTAP_REGULAR;
+  bp->best_pred_filter = av1_broadcast_interp_filter(EIGHTTAP_REGULAR);
   bp->best_mode_skip_txfm = 0;
   bp->best_second_ref_frame = NONE_FRAME;
   bp->best_pred = NULL;
@@ -1355,8 +1355,9 @@
     }
 
     // TODO(kyslov) bring back filter search
-    mi->interp_filters =
-        (filter_ref == SWITCHABLE) ? EIGHTTAP_REGULAR : filter_ref;
+    mi->interp_filters = (filter_ref == SWITCHABLE)
+                             ? av1_broadcast_interp_filter(EIGHTTAP_REGULAR)
+                             : av1_broadcast_interp_filter(filter_ref);
     av1_enc_build_inter_predictor(cm, xd, mi_row, mi_col, NULL, bsize,
                                   AOM_PLANE_Y, AOM_PLANE_Y);
 #if !_TMP_USE_CURVFIT_

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index eb61f5e..909d0c1 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6625,7 +6625,8 @@
     ref_yv12[1] = xd->plane[plane].pre[1];
 
     // Get the prediction block from the 'other' reference frame.
-    const InterpFilters interp_filters = EIGHTTAP_REGULAR;
+    const InterpFilters interp_filters =
+        av1_broadcast_interp_filter(EIGHTTAP_REGULAR);
 
     // Since we have scaled the reference frames to match the size of the
     // current frame we must use a unit scaling factor during mode selection.