diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-10-16 14:08:40 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-10-16 14:08:40 -0700 |
| commit | c073e5ca96bc5cf2e20c1c6cbc000be025b2e008 (patch) | |
| tree | 30bfe38d15a0825b8bb88a78b7fd1b9fa87bc975 /vp8/decoder/decodframe.c | |
| parent | 9443f05e6b10c2f4de9d21a77df2108dd829529b (diff) | |
| download | libvpx-c073e5ca96bc5cf2e20c1c6cbc000be025b2e008.tar libvpx-c073e5ca96bc5cf2e20c1c6cbc000be025b2e008.tar.gz libvpx-c073e5ca96bc5cf2e20c1c6cbc000be025b2e008.tar.bz2 libvpx-c073e5ca96bc5cf2e20c1c6cbc000be025b2e008.zip | |
Force interleaved decoding
Rather than decoding all modes/mvs separately, decode them per MB. This
forces the mode which was already used form the CONFIG_NEWBESTREFMV and
CONFIG_SUPERBLOCKS experiments, and is a precursor to changing to
interleaved encoding.
Change-Id: If19ee74ac8a987846d1cd0cf2b2e02a82f1a43ad
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index c46957202..bcf6ea3d4 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -635,8 +635,7 @@ decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd) { MODE_INFO *mi = xd->mode_info_context; #if CONFIG_SUPERBLOCKS - if (pbi->interleaved_decoding) - mi->mbmi.encoded_as_sb = vp8_read(&pbi->bc, pc->sb_coded); + mi->mbmi.encoded_as_sb = vp8_read(&pbi->bc, pc->sb_coded); #endif // Process the 4 MBs within the SB in the order: @@ -685,8 +684,7 @@ decode_sb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mbrow, MACROBLOCKD *xd) { if (i) mi->mbmi.encoded_as_sb = 0; #endif - if(pbi->interleaved_decoding) - vpx_decode_mb_mode_mv(pbi, xd, mb_row, mb_col); + vpx_decode_mb_mode_mv(pbi, xd, mb_row, mb_col); update_blockd_bmi(xd); @@ -1510,10 +1508,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) { /* Read the mb_no_coeff_skip flag */ pc->mb_no_coeff_skip = (int)vp8_read_bit(bc); - if(pbi->interleaved_decoding) - vpx_decode_mode_mvs_init(pbi); - else - vp8_decode_mode_mvs(pbi); + vpx_decode_mode_mvs_init(pbi); vpx_memset(pc->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * pc->mb_cols); |