commit 4d1b7d942caa7c19a5381cd531cf3c0e28ab0fba
author chiyotsai <chiyotsai@google.com> Tue Apr 07 13:56:22 2020 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Thu Apr 09 18:55:20 2020 +0000
tree 63ea556a511b089c8e978989ecd3b7ae7f13b325
parent 74da72b03e366df94a8dd5db76fe63ce25a19ab8

Simplify compound arguments for mcomp structs

BUG=aomedia:2594

Change-Id: I32ed34462a4cfb58e7779205d59e1f3ca55269b8

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index ea28956..b0e6339 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -48,7 +48,7 @@
   ms_buffers->ref = &x->e_mbd.plane[0].pre[0];
   ms_buffers->src = &x->plane[0].src;
 
-  set_ms_compound_refs(ms_buffers, NULL, NULL, 0, 0);
+  av1_set_ms_compound_refs(ms_buffers, NULL, NULL, 0, 0);
 
   ms_buffers->wsrc = x->wsrc_buf;
   ms_buffers->obmc_mask = x->mask_buf;
@@ -87,10 +87,7 @@
 void av1_make_default_subpel_ms_params(SUBPEL_MOTION_SEARCH_PARAMS *ms_params,
                                        const struct AV1_COMP *cpi,
                                        const MACROBLOCK *x, BLOCK_SIZE bsize,
-                                       const MV *ref_mv, const int *cost_list,
-                                       const uint8_t *second_pred,
-                                       const uint8_t *mask, int mask_stride,
-                                       int invert_mask) {
+                                       const MV *ref_mv, const int *cost_list) {
   const AV1_COMMON *cm = &cpi->common;
   // High level params
   ms_params->allow_hp = cm->features.allow_high_precision_mv;
@@ -113,7 +110,6 @@
   // Ref and src buffers
   MSBuffers *ms_buffers = &ms_params->var_params.ms_buffers;
   init_ms_buffers(ms_buffers, x);
-  set_ms_compound_refs(ms_buffers, second_pred, mask, mask_stride, invert_mask);
 }
 
 static INLINE int get_offset_from_fullmv(const FULLPEL_MV *mv, int stride) {