shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Added a speed feature"

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -839,6 +839,7 @@

   if (speed >= 5) {

     int i;

     sf->disable_split_mask = DISABLE_ALL_SPLIT;

+    sf->subpel_force_stop = 1;

     for (i = 0; i < TX_SIZES; i++) {

       sf->intra_y_mode_mask[i] = INTRA_DC_H_V;

       sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY;

@@ -867,6 +868,7 @@

   sf->recode_loop = 1;

   sf->subpel_search_method = SUBPEL_TREE;

   sf->subpel_iters_per_step = 2;

+  sf->subpel_force_stop = 0;

   sf->optimize_coefficients = !cpi->oxcf.lossless;

   sf->reduce_first_step_size = 0;

   sf->auto_mv_step_size = 0;

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -256,6 +256,9 @@

   // Maximum number of steps in logarithmic subpel search before giving up.

   int subpel_iters_per_step;

+  // Control when to stop subpel search

+  int subpel_force_stop;

+

   // Thresh_mult is used to set a threshold for the rd score. A higher value

   // means that we will accept the best mode so far more often. This number

   // is used in combination with the current block size, and thresh_freq_fact

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

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

@@ -1840,7 +1840,8 @@

                                          &bsi->ref_mv->as_mv,

                                          cm->allow_high_precision_mv,

                                          x->errorperbit, v_fn_ptr,

-                                         0, cpi->sf.subpel_iters_per_step,

+                                         cpi->sf.subpel_force_stop,

+                                         cpi->sf.subpel_iters_per_step,

                                          x->nmvjointcost, x->mvcost,

                                          &distortion,

                                          &x->pred_sse[mbmi->ref_frame[0]]);

@@ -2451,7 +2452,8 @@

                                  cm->allow_high_precision_mv,

                                  x->errorperbit,

                                  &cpi->fn_ptr[bsize],

-                                 0, cpi->sf.subpel_iters_per_step,

+                                 cpi->sf.subpel_force_stop,

+                                 cpi->sf.subpel_iters_per_step,

                                  x->nmvjointcost, x->mvcost,

                                  &dis, &x->pred_sse[ref]);

   }