diff options
author | John Koleszar <jkoleszar@google.com> | 2011-06-15 10:18:06 -0700 |
---|---|---|
committer | Code Review <code-review@webmproject.org> | 2011-06-15 10:18:06 -0700 |
commit | 5223016337377db5eb658ac064ab0301e82976a5 (patch) | |
tree | 1ca1fb55f8111b04b7d9d64d19014396dfd43295 /vp8 | |
parent | 1ade44b352a1ad59cea2b05d2b5c621db4572295 (diff) | |
parent | c7e6aabbca98f09e55a6d50ae0bb1e9d86387547 (diff) | |
download | libvpx-5223016337377db5eb658ac064ab0301e82976a5.tar libvpx-5223016337377db5eb658ac064ab0301e82976a5.tar.gz libvpx-5223016337377db5eb658ac064ab0301e82976a5.tar.bz2 libvpx-5223016337377db5eb658ac064ab0301e82976a5.zip |
Merge "Remove redundant check for KEY_FRAME in multithreaded decoder"
Diffstat (limited to 'vp8')
-rw-r--r-- | vp8/decoder/threading.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 77c3f1732..c1df823f1 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -135,7 +135,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m mb_init_dequantizer(pbi, xd); /* do prediction */ - if (xd->frame_type == KEY_FRAME || xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) + if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) { vp8mt_build_intra_predictors_mbuv(pbi, xd, mb_row, mb_col); @@ -181,7 +181,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int m xd->predictor, xd->dst.y_buffer, xd->dst.y_stride, xd->eobs, xd->block[24].diff); } - else if ((xd->frame_type == KEY_FRAME || xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) && xd->mode_info_context->mbmi.mode == B_PRED) + else if (xd->mode_info_context->mbmi.mode == B_PRED) { for (i = 0; i < 16; i++) { @@ -334,7 +334,7 @@ static THREAD_FUNCTION thread_decoding_proc(void *p_data) { MODE_INFO *next = xd->mode_info_context +1; - if (xd->frame_type == KEY_FRAME || next->mbmi.ref_frame == INTRA_FRAME) + if (next->mbmi.ref_frame == INTRA_FRAME) { for (i = 0; i < 16; i++) pbi->mt_yleft_col[mb_row][i] = xd->dst.y_buffer [i* recon_y_stride + 15]; @@ -824,7 +824,7 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd) { MODE_INFO *next = xd->mode_info_context +1; - if (xd->frame_type == KEY_FRAME || next->mbmi.ref_frame == INTRA_FRAME) + if (next->mbmi.ref_frame == INTRA_FRAME) { for (i = 0; i < 16; i++) pbi->mt_yleft_col[mb_row][i] = xd->dst.y_buffer [i* recon_y_stride + 15]; |