shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removed setup_pre_planes() call in read_mb_modes_mv()" into experimental

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -574,18 +574,9 @@

     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,

@@ -644,12 +635,6 @@

         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 ?