commit d8134c791d30678a5861e87588968c78b3789a27
author Jingning Han <jingning@google.com> Mon Nov 18 11:04:32 2019 -0800
committer Jingning Han <jingning@google.com> Mon Nov 18 21:39:20 2019 +0000
tree 0798dcc7caab7e21072a8c10f04651cf3522ec1e
parent 7a6c7dce3739b23c935582155050920b9c1c9345

Remove redundant params from av1_init_warp_params()

Change-Id: I88624c717af0f9079e334ff584bf35314e13b9d3

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 7977828..22dbe7b 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -95,7 +95,6 @@
 }
 
 void av1_init_warp_params(InterPredParams *inter_pred_params,
-                          const struct buf_2d *ref_buf,
                           const WarpTypesAllowed *warp_types, int ref,
                           const MACROBLOCKD *xd, const MB_MODE_INFO *mi) {
   if (inter_pred_params->block_height < 8 || inter_pred_params->block_width < 8)
@@ -107,8 +106,6 @@
                      inter_pred_params->scale_factors,
                      &inter_pred_params->warp_params))
     inter_pred_params->mode = WARP_PRED;
-
-  inter_pred_params->ref_frame_buf = *ref_buf;
 }
 
 void av1_init_mask_comp(InterPredParams *inter_pred_params, BLOCK_SIZE bsize,

av1/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index 7b3b51f..908ac19 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -134,7 +134,6 @@
 void av1_init_comp_mode(InterPredParams *inter_pred_params);
 
 void av1_init_warp_params(InterPredParams *inter_pred_params,
-                          const struct buf_2d *ref_buf,
                           const WarpTypesAllowed *warp_types, int ref,
                           const MACROBLOCKD *xd, const MB_MODE_INFO *mi);
 

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index f801eab..8f8c80a 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -829,8 +829,7 @@
           &inter_pred_params.conv_params.use_dist_wtd_comp_avg, is_compound);
 
       if (!build_for_obmc)
-        av1_init_warp_params(&inter_pred_params, &pd->pre[ref], &warp_types,
-                             ref, xd, mi);
+        av1_init_warp_params(&inter_pred_params, &warp_types, ref, xd, mi);
 
       if (is_masked_compound_type(mi->interinter_comp.type)) {
         av1_init_mask_comp(&inter_pred_params, mi->sb_type,

av1/encoder/reconinter_enc.c

diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index 0e6f8ac..b347431 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -208,8 +208,7 @@
           &inter_pred_params.conv_params.bck_offset,
           &inter_pred_params.conv_params.use_dist_wtd_comp_avg, is_compound);
 
-      av1_init_warp_params(&inter_pred_params, &pre_buf, &warp_types, ref, xd,
-                           mi);
+      av1_init_warp_params(&inter_pred_params, &warp_types, ref, xd, mi);
 
       if (is_masked_compound_type(mi->interinter_comp.type)) {
         av1_init_mask_comp(&inter_pred_params, mi->sb_type,
@@ -457,8 +456,7 @@
                           xd->block_ref_scale_factors[ref], &pd->pre[ref],
                           mi->interp_filters);
     inter_pred_params.conv_params = get_conv_params(0, plane, xd->bd);
-    av1_init_warp_params(&inter_pred_params, &pd->pre[ref], &warp_types, ref,
-                         xd, mi);
+    av1_init_warp_params(&inter_pred_params, &warp_types, ref, xd, mi);
 
     const struct buf_2d *const pre_buf = &pd->pre[ref];
     uint8_t *const dst = get_buf_by_bd(xd, ext_dst[plane]);