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 168b460127261526fdcb2bdbdf5f4dbd86d433ee..ab347b27cbab49c6f3cdfbfb3b669e4a7c4a4855 100644 (file)
--- 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)