commit 11132ce34cf2b570c66b5f63ab1e87010c2d06ff
author David Barker <david.barker@argondesign.com> Thu Jun 22 17:06:07 2017 +0100
committer Debargha Mukherjee <debargha@google.com> Fri Jun 23 17:23:27 2017 +0000
tree 8f07b44ecb9b881df9de6a4ef6b08872f97a6542
parent afe7c5fd7a9073a58e0b24069084100aecbf4735

Fix bug with chroma-sub8x8 + resizing

The special path in build_inter_predictors for chroma blocks
corresponding to sub8x8 luma blocks would always fetch the
scale factors from 'xd', which correspond (at least in the
decoder) to the references of the block for which is_chroma_reference
returns true.

The correct behaviour is to fetch the scale factors from 'ref_buf',
which corresponds to the references of the block currently being
predicted.

This patch fixes some encode/decode mismatches which were caused
by the above behaviour when the various reference frames had
different sizes.

Change-Id: I48a0a167ea25d47d08018016cf8b77885b3b5d6b

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index cd84dce..00fc282 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -998,10 +998,10 @@
 
 #if CONFIG_INTRABC
           const struct scale_factors *const sf =
-              is_intrabc ? &xd->sf_identity : &xd->block_refs[ref]->sf;
+              is_intrabc ? &xd->sf_identity : &ref_buf->sf;
           struct buf_2d *const pre_buf = is_intrabc ? dst_buf : &pd->pre[ref];
 #else
-          const struct scale_factors *const sf = &xd->block_refs[ref]->sf;
+          const struct scale_factors *const sf = &ref_buf->sf;
           struct buf_2d *const pre_buf = &pd->pre[ref];
 #endif  // CONFIG_INTRABC
           uint8_t *dst = dst_buf->buf;