diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-10-19 15:12:12 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-10-20 21:28:38 -0700 |
| commit | 57679badf2970455117fb95e766d2ed202eb31bf (patch) | |
| tree | 952b83e722c475d394ca08986f7482d27c309b4c /vp8/encoder/encodeframe.c | |
| parent | f3208f362b0a08b815a3439c7d71890eef49f174 (diff) | |
| download | libvpx-57679badf2970455117fb95e766d2ed202eb31bf.tar libvpx-57679badf2970455117fb95e766d2ed202eb31bf.tar.gz libvpx-57679badf2970455117fb95e766d2ed202eb31bf.tar.bz2 libvpx-57679badf2970455117fb95e766d2ed202eb31bf.zip | |
Allow B_VL_PRED & B_LD_PRED modes with Superblocks
Allows B_VL_PRED & B_LD_PRED modes to be used for all blocks
within a MB in B_PRED mode. These modes were temporarily
disabled with super-block coding.
Change-Id: I973b9bdb82c3da5f12d7cc963162a28805f25303
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index c92ec0253..619695c33 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1945,10 +1945,12 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, if (mbmi->mode == I8X8_PRED) { vp8_encode_intra8x8mby(IF_RTCD(&cpi->rtcd), x); vp8_encode_intra8x8mbuv(IF_RTCD(&cpi->rtcd), x); - } else if (mbmi->mode == B_PRED) + } else if (mbmi->mode == B_PRED) { + vp8_intra_prediction_down_copy(&x->e_mbd); vp8_encode_intra4x4mby(IF_RTCD(&cpi->rtcd), x); - else + } else { vp8_encode_intra16x16mby(IF_RTCD(&cpi->rtcd), x); + } if (mbmi->mode != I8X8_PRED) { vp8_encode_intra16x16mbuv(IF_RTCD(&cpi->rtcd), x); @@ -2049,6 +2051,7 @@ void vp8cx_encode_inter_macroblock (VP8_COMP *cpi, MACROBLOCK *x, if (mbmi->ref_frame == INTRA_FRAME) { if (mbmi->mode == B_PRED) { + vp8_intra_prediction_down_copy(xd); vp8_encode_intra16x16mbuv(IF_RTCD(&cpi->rtcd), x); vp8_encode_intra4x4mby(IF_RTCD(&cpi->rtcd), x); } else if (mbmi->mode == I8X8_PRED) { |