diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 408573f9d..c66324432 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -144,7 +144,8 @@ static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m, 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]); } diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 0d5de648e..b6dd984a3 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -914,7 +914,8 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, 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; |