ref: 8c70a0fcab18ed3ebbdceee43a9e4305251677ae
parent: aede2a1a00ac280347bad27d6b832b134b8c2a6d
parent: 35e80726137a31da1482dbb4a78029c89706192e
author: Jingning Han <jingning@google.com>
date: Mon May 6 18:28:04 EDT 2013
Merge "Fix tile independency issue in sb8x8" into experimental
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -144,7 +144,8 @@
int i;
for (i = 0; i < (16 >> (2 * CONFIG_SB8X8)); ++i) {
const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
- const B_PREDICTION_MODE l = xd->left_available || (i & 3) ?
+ const B_PREDICTION_MODE l = xd->left_available ||
+ (i & (3 >> CONFIG_SB8X8)) ?
left_block_mode(m, i) : B_DC_PRED;
m->bmi[i].as_mode.first = read_kf_bmode(r, cm->kf_bmode_prob[a][l]);
}
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -914,7 +914,8 @@
int i = 0;
do {
const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
- const B_PREDICTION_MODE l = (xd->left_available || (i & 3)) ?
+ const B_PREDICTION_MODE l = (xd->left_available ||
+ (i & (3 >> CONFIG_SB8X8))) ?
left_block_mode(m, i) : B_DC_PRED;
const int bm = m->bmi[i].as_mode.first;
--
⑨