diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-21 15:35:24 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-21 15:35:24 -0700 |
| commit | 788d7f10d4e03b58b02c14b961200ccb3134c4f0 (patch) | |
| tree | c24362b1a4b5c38b9b9e6684c8a5db2ed6ccf8ed /vp8/decoder/decodframe.c | |
| parent | 91dc8ce70d8071b114c907bf760d65bad83fe072 (diff) | |
| parent | 57679badf2970455117fb95e766d2ed202eb31bf (diff) | |
| download | libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar.gz libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.tar.bz2 libvpx-788d7f10d4e03b58b02c14b961200ccb3134c4f0.zip | |
Merge "Allow B_VL_PRED & B_LD_PRED modes with Superblocks" into experimental
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 197ca4243..01739c0db 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -296,13 +296,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, if (mode != B_PRED) { vp8_build_intra_predictors_mby(xd); } -#if 0 - // Intra-modes requiring recon data from top-right - // MB have been temporarily disabled. - else { - vp8_intra_prediction_down_copy(xd); - } -#endif } } else { #if CONFIG_SUPERBLOCKS @@ -371,6 +364,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, b->dst_stride); } } else if (mode == B_PRED) { + vp8_intra_prediction_down_copy(xd); for (i = 0; i < 16; i++) { BLOCKD *b = &xd->block[i]; int b_mode = xd->mode_info_context->bmi[i].as_mode.first; @@ -596,6 +590,8 @@ decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd, int dx = col_delta[i]; int offset_extended = dy * xd->mode_info_stride + dx; + xd->mb_index = i; + mi = xd->mode_info_context; if ((mb_row >= pc->mb_rows) || (mb_col >= pc->mb_cols)) { // MB lies outside frame, skip on to next |