Commit 491983d7 authored by David Barker's avatar David Barker Committed by Debargha Mukherjee

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
parent 599dfd01
......@@ -1372,7 +1372,8 @@ static void fpm_sync(void *const data, int mi_row) {
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 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment