Commit c36b6d4d authored by Scott LaVarnway's avatar Scott LaVarnway Committed by Code Review
Browse files

Merge "Removed unnecessary frame type checks"

parents 5b673297 6f6cd3ab
...@@ -111,9 +111,8 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) ...@@ -111,9 +111,8 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd)
*/ */
static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd) static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd)
{ {
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)
{ {
vp8_build_intra_predictors_mbuv_s(xd); vp8_build_intra_predictors_mbuv_s(xd);
RECON_INVOKE(&pbi->common.rtcd.recon, RECON_INVOKE(&pbi->common.rtcd.recon,
build_intra_predictors_mby_s)(xd); build_intra_predictors_mby_s)(xd);
...@@ -207,7 +206,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) ...@@ -207,7 +206,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd)
mb_init_dequantizer(pbi, xd); mb_init_dequantizer(pbi, xd);
/* do prediction */ /* 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)
{ {
vp8_build_intra_predictors_mbuv(xd); vp8_build_intra_predictors_mbuv(xd);
...@@ -254,7 +253,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) ...@@ -254,7 +253,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd)
xd->predictor, xd->dst.y_buffer, xd->predictor, xd->dst.y_buffer,
xd->dst.y_stride, xd->eobs, xd->block[24].diff); 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++) for (i = 0; i < 16; i++)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment