diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-06-28 07:01:15 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-28 07:01:15 -0700 |
| commit | 5de08054aeae55560e0a2ad5f5dfbe295272a2e6 (patch) | |
| tree | bdb2fc715d1f81ab9e4d709391ca39d41ac6cafb /vp9 | |
| parent | 5ec57c91b76d8afa4a5fdb70588f7fd04e3831d7 (diff) | |
| parent | fd4eed3b08dc3b8a295f4e7d602435f0b9e364a3 (diff) | |
| download | libvpx-5de08054aeae55560e0a2ad5f5dfbe295272a2e6.tar libvpx-5de08054aeae55560e0a2ad5f5dfbe295272a2e6.tar.gz libvpx-5de08054aeae55560e0a2ad5f5dfbe295272a2e6.tar.bz2 libvpx-5de08054aeae55560e0a2ad5f5dfbe295272a2e6.zip | |
Merge "Fix tile independence with both column tiling and static_thresh set."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) |