commit bc1f0ccf4f115e1c87c552e5051f597e5bdcb379
author Jingning Han <jingning@google.com> Tue Nov 19 16:54:47 2019 -0800
committer Jingning Han <jingning@google.com> Wed Nov 20 17:01:28 2019 +0000
tree 33161cb98bcfd6dfaf08100c1e00bee5cb9f72b9
parent 12478f30bb9e0bf2f381b73f2a43cfba5d352e98

Clean up joint motion search

Change-Id: I29764c3f7bf41b4c3c7b494fd91f3bbd1d63bbff

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 7c8fd21..cb495f7 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6995,21 +6995,10 @@
   int_mv ref_mv[2];
   int ite, ref;
 
-  WarpTypesAllowed warp_types[2];
-  for (ref = 0; ref < 2; ++ref) {
-    const WarpedMotionParams *const wm =
-        &xd->global_motion[xd->mi[0]->ref_frame[ref]];
-    const int is_global = is_global_mv_block(xd->mi[0], wm->wmtype);
-    warp_types[ref].global_warp_allowed = is_global;
-    warp_types[ref].local_warp_allowed = mbmi->motion_mode == WARPED_CAUSAL;
-  }
-
   // Get the prediction block from the 'other' reference frame.
   const int_interpfilters interp_filters =
       av1_broadcast_interp_filter(EIGHTTAP_REGULAR);
 
-  (void)warp_types;
-
   InterPredParams inter_pred_params;
   const int mi_row = xd->mi_row;
   const int mi_col = xd->mi_col;