commit 6810eb1ab717fa1aabfafd2776d700e90f4fe4d2
author Yunqing Wang <yunqingwang@google.com> Tue Jan 10 14:03:54 2023 -0800
committer Yunqing Wang <yunqingwang@google.com> Tue Jan 10 23:21:13 2023 +0000
tree 47ae24bc38657bd102a1f677f1eab4a99dd50c7d
parent af463d31cea2e913cfd7581b9acf90730d7b23e7

Minor improvement in av1_int_pro_motion_estimation()

Tested zero MV only when int_pro motion search result is non-zero.

Change-Id: Ibc350951a44e43e3da3c4c12f8c9cbcc15dbfeb8

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 4bd72a8..7d239c7 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2001,12 +2001,11 @@
                          MAX_MB_PLANE);
   }
 
-  // Evaluate zero MV first
-  best_int_mv->as_fullmv = kZeroFullMv;
-  best_sad = cpi->ppi->fn_ptr[bsize].sdf(x->plane[0].src.buf, src_stride,
-                                         xd->plane[0].pre[0].buf, ref_stride);
-
   if (xd->bd != 8) {
+    best_int_mv->as_fullmv = kZeroFullMv;
+    best_sad = cpi->ppi->fn_ptr[bsize].sdf(x->plane[0].src.buf, src_stride,
+                                           xd->plane[0].pre[0].buf, ref_stride);
+
     if (scaled_ref_frame) {
       int i;
       for (i = 0; i < MAX_MB_PLANE; i++) xd->plane[i].pre[0] = backup_yv12[i];
@@ -2036,16 +2035,20 @@
   FULLPEL_MV this_mv = best_int_mv->as_fullmv;
   src_buf = x->plane[0].src.buf;
   ref_buf = get_buf_from_fullmv(&xd->plane[0].pre[0], &this_mv);
-  tmp_sad =
+  best_sad =
       cpi->ppi->fn_ptr[bsize].sdf(src_buf, src_stride, ref_buf, ref_stride);
 
-  // Check if zero mv performs better.
-  if (best_sad < tmp_sad) {
-    best_int_mv->as_fullmv = kZeroFullMv;
-    this_mv = best_int_mv->as_fullmv;
-    ref_buf = xd->plane[0].pre[0].buf;
-  } else {
-    best_sad = tmp_sad;
+  // Evaluate zero MV if found MV is non-zero.
+  if (best_int_mv->as_int != 0) {
+    tmp_sad = cpi->ppi->fn_ptr[bsize].sdf(x->plane[0].src.buf, src_stride,
+                                          xd->plane[0].pre[0].buf, ref_stride);
+
+    if (tmp_sad < best_sad) {
+      best_int_mv->as_fullmv = kZeroFullMv;
+      this_mv = best_int_mv->as_fullmv;
+      ref_buf = xd->plane[0].pre[0].buf;
+      best_sad = tmp_sad;
+    }
   }
 
   {