commit 4c69a1ace4a7429b8e13fc008a1955d7ae05815e
author Peter de Rivaz <peter.derivaz@argondesign.com> Thu Oct 12 14:31:23 2017 +0100
committer Peter de Rivaz <peter.derivaz@argondesign.com> Mon Oct 23 07:38:58 2017 +0000
tree 76d406a4cbb52b24c39f078576ebd3aa4fe79535
parent 13f0d9cd9969beda7ffca7acf9e124b7223dc0d4

Don't warp sub 8x8 chroma blocks

BUG=aomedia:896

Change-Id: I414a1d7c924609ceb1cbf3edabae74d7521b8e55

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index 7001ea7..ac1059d 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -162,23 +162,25 @@
 
 #if CONFIG_WARPED_MOTION || CONFIG_GLOBAL_MOTION
   WarpedMotionParams final_warp_params;
-  const int do_warp = allow_warp(
-      mi, warp_types,
+  const int do_warp =
+      (w >= 8 && h >= 8 &&
+       allow_warp(mi, warp_types,
 #if CONFIG_GLOBAL_MOTION
 #if CONFIG_COMPOUND_SINGLEREF
-      // TODO(zoeliu): To further check the single
-      // ref comp mode to work together with
-      //               global motion.
-      has_second_ref(&mi->mbmi) ? &xd->global_motion[mi->mbmi.ref_frame[ref]]
-                                : &xd->global_motion[mi->mbmi.ref_frame[0]],
+                  // TODO(zoeliu): To further check the single
+                  // ref comp mode to work together with
+                  //               global motion.
+                  has_second_ref(&mi->mbmi)
+                      ? &xd->global_motion[mi->mbmi.ref_frame[ref]]
+                      : &xd->global_motion[mi->mbmi.ref_frame[0]],
 #else   // !(CONFIG_COMPOUND_SINGLEREF)
-      &xd->global_motion[mi->mbmi.ref_frame[ref]],
+                  &xd->global_motion[mi->mbmi.ref_frame[ref]],
 #endif  // CONFIG_COMPOUND_SINGLEREF
 #endif  // CONFIG_GLOBAL_MOTION
 #if CONFIG_MOTION_VAR
-      build_for_obmc,
+                  build_for_obmc,
 #endif  // CONFIG_MOTION_VAR
-      &final_warp_params);
+                  &final_warp_params));
   if (do_warp
 #if CONFIG_AMVR
       && xd->cur_frame_mv_precision_level == 0