From fd4eed3b08dc3b8a295f4e7d602435f0b9e364a3 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Thu, 27 Jun 2013 19:50:23 -0700
Subject: [PATCH] Fix tile independence with both column tiling and
static_thresh set.
Change-Id: I0b2be0ec2c410a527f88b95a44f24ac967b2dac1
---
vp9/encoder/vp9_encodeframe.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 168b460127..ab347b27cb 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2132,9 +2132,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
vp9_tokenize_sb(cpi, xd, t, !output_enabled,
(bsize < BLOCK_SIZE_SB8X8) ? BLOCK_SIZE_SB8X8 : bsize);
} else {
- // FIXME(rbultje): not tile-aware (mi - 1)
- int mb_skip_context = (mi - 1)->mbmi.mb_skip_coeff
- + (mi - mis)->mbmi.mb_skip_coeff;
+ int mb_skip_context = xd->left_available ? (mi - 1)->mbmi.mb_skip_coeff : 0;
+ mb_skip_context += (mi - mis)->mbmi.mb_skip_coeff;
mbmi->mb_skip_coeff = 1;
if (output_enabled)
--
GitLab