From: Ronald S. Bultje <rbultje@google.com>
Date: Fri, 28 Jun 2013 02:50:23 +0000 (-0700)
Subject: Fix tile independence with both column tiling and static_thresh set.
X-Git-Tag: v1.3.0~995^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd4eed3b08dc3b8a295f4e7d602435f0b9e364a3;p=libvpx

Fix tile independence with both column tiling and static_thresh set.

Change-Id: I0b2be0ec2c410a527f88b95a44f24ac967b2dac1
---

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 168b46012..ab347b27c 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)