shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Enable adaptive motion search for ARF coding"

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

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

@@ -374,7 +374,6 @@

   uint8_t *ref_y_ptr;

   const int num_mv_refs = MAX_MV_REF_CANDIDATES +

                     (cpi->sf.adaptive_motion_search &&

-                     cpi->common.show_frame &&

                      block_size < cpi->sf.max_partition_size);

   MV pred_mv[3];

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

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

@@ -1398,7 +1398,7 @@

           mvp_full.row = bsi->mvp.as_mv.row >> 3;

           mvp_full.col = bsi->mvp.as_mv.col >> 3;

-          if (cpi->sf.adaptive_motion_search && cm->show_frame) {

+          if (cpi->sf.adaptive_motion_search) {

             mvp_full.row = x->pred_mv[mbmi->ref_frame[0]].row >> 3;

             mvp_full.col = x->pred_mv[mbmi->ref_frame[0]].col >> 3;

             step_param = MAX(step_param, 8);

@@ -1815,8 +1815,7 @@

     step_param = cpi->mv_step_param;

   }

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

-      cm->show_frame) {

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

     int boffset = 2 * (b_width_log2(BLOCK_64X64) - MIN(b_height_log2(bsize),

                                                        b_width_log2(bsize)));

     step_param = MAX(step_param, boffset);

@@ -1876,7 +1875,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 && cm->show_frame)

+  if (cpi->sf.adaptive_motion_search)

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

   if (scaled_ref_frame) {