shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use the pred_mv feature for speed 0"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3963,7 +3963,7 @@

   }

   // store estimated motion vector

-  if (cpi->sf.adaptive_motion_search) store_pred_mv(x, ctx);

+  store_pred_mv(x, ctx);

   // If the interp_filter is marked as SWITCHABLE_FILTERS, it was for an

   // intra block and used for context purposes.

@@ -3978,7 +3978,7 @@

   // the starting point of motion search in the following partition type check.

   if (do_split || must_split) {

     subsize = get_subsize(bsize, PARTITION_SPLIT);

-    if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx);

+    load_pred_mv(x, ctx);

     if (bsize == BLOCK_8X8) {

       i = 4;

       if (cpi->sf.adaptive_pred_interp_filter && partition_none_allowed)

@@ -4091,7 +4091,7 @@

     const int64_t part_mode_rdcost =

         RDCOST(partition_mul, x->rddiv, part_mode_rate, 0);

     subsize = get_subsize(bsize, PARTITION_HORZ);

-    if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx);

+    load_pred_mv(x, ctx);

     if (cpi->sf.adaptive_pred_interp_filter && bsize == BLOCK_8X8 &&

         partition_none_allowed)

       pc_tree->horizontal[0].pred_interp_filter = pred_interp_filter;

@@ -4141,7 +4141,7 @@

     const int64_t part_mode_rdcost =

         RDCOST(partition_mul, x->rddiv, part_mode_rate, 0);

     subsize = get_subsize(bsize, PARTITION_VERT);

-    if (cpi->sf.adaptive_motion_search) load_pred_mv(x, ctx);

+    load_pred_mv(x, ctx);

     if (cpi->sf.adaptive_pred_interp_filter && bsize == BLOCK_8X8 &&

         partition_none_allowed)

       pc_tree->vertical[0].pred_interp_filter = pred_interp_filter;

@@ -4683,7 +4683,7 @@

   // PARTITION_HORZ

   if (partition_horz_allowed && do_rect) {

     subsize = get_subsize(bsize, PARTITION_HORZ);

-    if (sf->adaptive_motion_search) load_pred_mv(x, ctx);

+    load_pred_mv(x, ctx);

     pc_tree->horizontal[0].pred_pixel_ready = 1;

     nonrd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &sum_rdc, subsize,

                         &pc_tree->horizontal[0]);

@@ -4727,7 +4727,7 @@

   // PARTITION_VERT

   if (partition_vert_allowed && do_rect) {

     subsize = get_subsize(bsize, PARTITION_VERT);

-    if (sf->adaptive_motion_search) load_pred_mv(x, ctx);

+    load_pred_mv(x, ctx);

     pc_tree->vertical[0].pred_pixel_ready = 1;

     nonrd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &sum_rdc, subsize,

                         &pc_tree->vertical[0]);

--- a/vp9/encoder/vp9_rd.c

+++ b/vp9/encoder/vp9_rd.c

@@ -545,8 +545,7 @@

   uint8_t *src_y_ptr = x->plane[0].src.buf;

   uint8_t *ref_y_ptr;

   const int num_mv_refs =

-      MAX_MV_REF_CANDIDATES +

-      (cpi->sf.adaptive_motion_search && block_size < x->max_partition_size);

+      MAX_MV_REF_CANDIDATES + (block_size < x->max_partition_size);

   MV pred_mv[3];

   pred_mv[0] = x->mbmi_ext->ref_mvs[ref_frame][0].as_mv;

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -2019,8 +2019,7 @@

             seg_mvs[i][mi->ref_frame[0]].as_mv = *new_mv;

           }

-          if (sf->adaptive_motion_search)

-            x->pred_mv[mi->ref_frame[0]] = *new_mv;

+          x->pred_mv[mi->ref_frame[0]] = *new_mv;

           // restore src pointers

           mi_buf_restore(x, orig_src, orig_pre);

@@ -2363,7 +2362,7 @@

   }

   if (cpi->sf.adaptive_motion_search && bsize < BLOCK_64X64) {

-    int boffset =

+    const int boffset =

         2 * (b_width_log2_lookup[BLOCK_64X64] -

              VPXMIN(b_height_log2_lookup[bsize], b_width_log2_lookup[bsize]));

     step_param = VPXMAX(step_param, boffset);

@@ -2447,7 +2446,7 @@

   *rate_mv = vp9_mv_bit_cost(&tmp_mv->as_mv, &ref_mv, x->nmvjointcost,

                              x->mvcost, MV_COST_WEIGHT);

-  if (cpi->sf.adaptive_motion_search) x->pred_mv[ref] = tmp_mv->as_mv;

+  x->pred_mv[ref] = tmp_mv->as_mv;

   if (scaled_ref_frame) {

     int i;