ref: 5de08054aeae55560e0a2ad5f5dfbe295272a2e6
parent: 5ec57c91b76d8afa4a5fdb70588f7fd04e3831d7
parent: fd4eed3b08dc3b8a295f4e7d602435f0b9e364a3
author: Ronald S. Bultje <rbultje@google.com>
date: Fri Jun 28 03:01:15 EDT 2013
Merge "Fix tile independence with both column tiling and static_thresh set."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2132,9 +2132,8 @@
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)
--
⑨