commit a0c1638f02231a1854a0777e08eed2f2c7654c60
author David Barker <david.barker@argondesign.com> Fri Jul 07 17:01:30 2017 +0100
committer Debargha Mukherjee <debargha@google.com> Fri Jul 07 22:08:24 2017 +0000
tree 158925d4e0a8f2161eff9ff738a20b70b918abd3
parent 073590e410d848c4b714b625e228316625608c3c

Fix a logic error with cb4x4 disabled

In the case where:
* global-motion and ext-inter are both enabled
* cb4x4 is disabled
* We have an 8x8 macroblock which is partitioned into smaller blocks

the function is_nontrans_global_motion has a bug where it will
always act as if that macroblock does not use global motion. This
patch fixes that logic bug.

Change-Id: I712d7bab6d646726d97aa37630399b4bcbee7757

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 3471977..1d9acf1 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1480,11 +1480,10 @@
 #endif  // CONFIG_EXT_INTER
   } else {
 #if CONFIG_EXT_INTER
-    if (mi->bmi[0].as_mode != ZEROMV || mi->bmi[1].as_mode != ZEROMV ||
-        mi->bmi[2].as_mode != ZEROMV || mi->bmi[3].as_mode != ZEROMV ||
-        mi->bmi[0].as_mode != ZERO_ZEROMV ||
-        mi->bmi[1].as_mode != ZERO_ZEROMV ||
-        mi->bmi[2].as_mode != ZERO_ZEROMV || mi->bmi[3].as_mode != ZERO_ZEROMV)
+    if ((mi->bmi[0].as_mode != ZEROMV && mi->bmi[0].as_mode != ZERO_ZEROMV) ||
+        (mi->bmi[1].as_mode != ZEROMV && mi->bmi[1].as_mode != ZERO_ZEROMV) ||
+        (mi->bmi[2].as_mode != ZEROMV && mi->bmi[2].as_mode != ZERO_ZEROMV) ||
+        (mi->bmi[3].as_mode != ZEROMV && mi->bmi[3].as_mode != ZERO_ZEROMV))
       return 0;
 #else
     if (mi->bmi[0].as_mode != ZEROMV || mi->bmi[1].as_mode != ZEROMV ||