commit 5e95d28d68cfa01e37bc918469beb8d001c032eb
author Jingning Han <jingning@google.com> Thu Dec 19 12:04:17 2019 -0800
committer Jingning Han <jingning@google.com> Thu Dec 19 12:10:32 2019 -0800
tree c113d2e3fbcb2d9b80f9c587ebfeaf2773c3c046
parent 183b2a88c4efa02f32777bda0ab784ae551a3cf4

Make full_pixel_diamond support compound mode

Add compound mode support to full_pixel_diamond() function.

Change-Id: I439c64ed785ec209cc5e16f6ef0485ef0229d59c

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 1a4fd61..e95041a 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -1886,8 +1886,20 @@
   int bestsme = av1_diamond_search_sad_c(x, cfg, mvp_full, &temp_mv, step_param,
                                          sadpb, &n, fn_ptr, ref_mv, second_pred,
                                          mask, mask_stride, inv_mask);
-  if (bestsme < INT_MAX)
-    bestsme = av1_get_mvpred_var(x, &temp_mv, ref_mv, fn_ptr, use_var);
+
+  if (bestsme < INT_MAX) {
+    if (mask)
+      bestsme = av1_get_mvpred_mask_var(
+          x, &temp_mv, ref_mv, second_pred, mask, mask_stride, inv_mask, fn_ptr,
+          &x->plane[0].src, &x->e_mbd.plane[0].pre[0], use_var);
+    else if (second_pred)
+      bestsme = av1_get_mvpred_av_var(x, &temp_mv, ref_mv, second_pred, fn_ptr,
+                                      &x->plane[0].src,
+                                      &x->e_mbd.plane[0].pre[0], use_var);
+    else
+      bestsme = av1_get_mvpred_var(x, &temp_mv, ref_mv, fn_ptr, use_var);
+  }
+
   x->best_mv.as_mv = temp_mv;
 
   // If there won't be more n-step search, check to see if refining search is
@@ -1901,8 +1913,19 @@
       thissme = av1_diamond_search_sad_c(
           x, cfg, mvp_full, &temp_mv, step_param + n, sadpb, &num00, fn_ptr,
           ref_mv, second_pred, mask, mask_stride, inv_mask);
-      if (thissme < INT_MAX)
-        thissme = av1_get_mvpred_var(x, &temp_mv, ref_mv, fn_ptr, use_var);
+
+      if (thissme < INT_MAX) {
+        if (mask)
+          thissme = av1_get_mvpred_mask_var(
+              x, &temp_mv, ref_mv, second_pred, mask, mask_stride, inv_mask,
+              fn_ptr, &x->plane[0].src, &x->e_mbd.plane[0].pre[0], use_var);
+        else if (second_pred)
+          thissme = av1_get_mvpred_av_var(x, &temp_mv, ref_mv, second_pred,
+                                          fn_ptr, &x->plane[0].src,
+                                          &x->e_mbd.plane[0].pre[0], use_var);
+        else
+          thissme = av1_get_mvpred_var(x, &temp_mv, ref_mv, fn_ptr, use_var);
+      }
 
       if (thissme < bestsme) {
         bestsme = thissme;