From 64b30f41cdc2f848956dd19497c472193883349f Mon Sep 17 00:00:00 2001 From: Scott LaVarnway <slavarnway@google.com> Date: Fri, 24 May 2013 13:39:48 -0400 Subject: [PATCH] Removed setup_pre_planes() call in read_mb_modes_mv() This code does not seem to be necessary anymore. For the 1080p clip used, the decoder performance improved by ~2%. Change-Id: I66bb0496d4998b0d6c6637c746b642b77bdbef88 --- vp9/decoder/vp9_decodemv.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index a5fc07b59a..6b5bb4e367 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -580,18 +580,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, int_mv nearest, nearby, best_mv; int_mv nearest_second, nearby_second, best_mv_second; vp9_prob mv_ref_p[VP9_MVREFS - 1]; - const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame; - struct scale_factors *sf0 = &xd->scale_factor[0]; - *sf0 = cm->active_ref_scale[mbmi->ref_frame - 1]; { - // Select the appropriate reference frame for this MB - const int ref_fb_idx = cm->active_ref_idx[ref_frame - 1]; - - setup_pre_planes(xd, &cm->yv12_fb[ref_fb_idx], NULL, - mi_row, mi_col, xd->scale_factor, xd->scale_factor_uv); - #ifdef DEC_DEBUG if (dec_debug) printf("%d %d\n", xd->mode_info_context->mbmi.mv[0].as_mv.row, @@ -650,12 +641,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, mbmi->second_ref_frame = 1; if (mbmi->second_ref_frame > 0) { const MV_REFERENCE_FRAME second_ref_frame = mbmi->second_ref_frame; - struct scale_factors *sf1 = &xd->scale_factor[1]; - const int second_ref_fb_idx = cm->active_ref_idx[second_ref_frame - 1]; - *sf1 = cm->active_ref_scale[second_ref_frame - 1]; - - setup_pre_planes(xd, NULL, &cm->yv12_fb[second_ref_fb_idx], - mi_row, mi_col, xd->scale_factor, xd->scale_factor_uv); vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? -- GitLab