commit 491983d7f68aa94605395008516160079c50cd0b
author David Barker <david.barker@argondesign.com> Thu Nov 10 13:22:17 2016 +0000
committer Debargha Mukherjee <debargha@google.com> Thu Nov 10 15:25:57 2016 +0000
tree a8b5e90fcfdcf70fa015c929a69d766fb017eabe
parent 599dfd01f097588aa3faf3dec321de5f4441432a

Fix test failures with supertx + warped-motion

In this combination, the parameter 'supertx_enabled' was never
passed to read_inter_block_mode_info, so the address of the
function of the same name was unintentionally used instead.
This always evaluates to true, which caused lots of test
failures (eg, with test filter *EndToEnd*)

Change-Id: If7a31f517aeb170a3c7cf14ed65e1d8511781718

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index c70daa7..b7fa43e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1372,7 +1372,8 @@
 static void read_inter_block_mode_info(AV1Decoder *const pbi,
                                        MACROBLOCKD *const xd,
                                        MODE_INFO *const mi,
-#if (CONFIG_MOTION_VAR || CONFIG_EXT_INTER) && CONFIG_SUPERTX
+#if (CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION || CONFIG_EXT_INTER) && \
+    CONFIG_SUPERTX
                                        int mi_row, int mi_col, aom_reader *r,
                                        int supertx_enabled) {
 #else
@@ -1911,7 +1912,8 @@
 
   if (inter_block)
     read_inter_block_mode_info(pbi, xd,
-#if (CONFIG_MOTION_VAR || CONFIG_EXT_INTER) && CONFIG_SUPERTX
+#if (CONFIG_MOTION_VAR || CONFIG_EXT_INTER || CONFIG_WARPED_MOTION) && \
+    CONFIG_SUPERTX
 
                                mi, mi_row, mi_col, r, supertx_enabled);
 #else