shithub: libvpx

Info  •  Files  •  Log  •  Branches

Clean up of the search best filter speed feature

Removes this speed feature since it is very slow and unlikely
to be used in practice. This cleanup removes a bunch of unnecessary
complications in the outer encode loop.

Change-Id: I3c66ef1ca924fbfad7dadff297c9e7f652d308a1

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

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

@@ -53,10 +53,6 @@

 #define DEFAULT_INTERP_FILTER SWITCHABLE

-#define SEARCH_BEST_FILTER 0            /* to search exhaustively for

-                                           best filter */

-#define RESET_FOREACH_FILTER 0          /* whether to reset the encoder state

-                                           before trying each new filter */

 #define SHARP_FILTER_QTHRESH 0          /* Q threshold for 8-tap sharp filter */

 #define ALTREF_HIGH_PRECISION_MV 1      /* whether to use high precision mv

@@ -755,7 +751,6 @@

   switch (mode) {

     case 0: // best quality mode

-      sf->search_best_filter = SEARCH_BEST_FILTER;

       break;

     case 1:

@@ -2588,25 +2583,7 @@

   SPEED_FEATURES *sf = &cpi->sf;

   unsigned int max_mv_def = MIN(cpi->common.width, cpi->common.height);

   struct segmentation *seg = &cm->seg;

-#if RESET_FOREACH_FILTER

-  int q_low0;

-  int q_high0;

-  int Q0;

-  int active_best_quality0;

-  int active_worst_quality0;

-  double rate_correction_factor0;

-  double gf_rate_correction_factor0;

-#endif

-  /* list of filters to search over */

-  int mcomp_filters_to_search[] = {

-    EIGHTTAP, EIGHTTAP_SHARP, EIGHTTAP_SMOOTH, SWITCHABLE

-  };

-  int mcomp_filters = sizeof(mcomp_filters_to_search) /

-      sizeof(*mcomp_filters_to_search);

-  int mcomp_filter_index = 0;

-  int64_t mcomp_filter_cost[4];

-

   /* Scale the source buffer, if required */

   if (cm->mi_cols * 8 != cpi->un_scaled_source->y_width ||

       cm->mi_rows * 8 != cpi->un_scaled_source->y_height) {

@@ -2917,14 +2894,8 @@

   vp9_zero(cpi->rd_tx_select_threshes);

   if (cm->frame_type != KEY_FRAME) {

+    cm->mcomp_filter_type = DEFAULT_INTERP_FILTER;

     /* TODO: Decide this more intelligently */

-    if (sf->search_best_filter) {

-      cm->mcomp_filter_type = mcomp_filters_to_search[0];

-      mcomp_filter_index = 0;

-    } else {

-      cm->mcomp_filter_type = DEFAULT_INTERP_FILTER;

-    }

-    /* TODO: Decide this more intelligently */

     xd->allow_high_precision_mv = q < HIGH_PRECISION_MV_QTHRESH;

     set_mvcost(&cpi->mb);

   }

@@ -2962,17 +2933,6 @@

   vp9_write_yuv_frame(cpi->Source);

 #endif

-#if RESET_FOREACH_FILTER

-  if (sf->search_best_filter) {

-    q_low0 = q_low;

-    q_high0 = q_high;

-    Q0 = Q;

-    rate_correction_factor0 = cpi->rate_correction_factor;

-    gf_rate_correction_factor0 = cpi->gf_rate_correction_factor;

-    active_best_quality0 = cpi->active_best_quality;

-    active_worst_quality0 = cpi->active_worst_quality;

-  }

-#endif

   do {

     vp9_clear_system_state();  // __asm emms;

@@ -3150,55 +3110,6 @@

     if (cpi->is_src_frame_alt_ref)

       loop = 0;

-

-    if (!loop && cm->frame_type != KEY_FRAME && sf->search_best_filter) {

-      if (mcomp_filter_index < mcomp_filters) {

-        int64_t err = vp9_calc_ss_err(cpi->Source,

-                                      &cm->yv12_fb[cm->new_fb_idx]);

-        int64_t rate = cpi->projected_frame_size << 8;

-        mcomp_filter_cost[mcomp_filter_index] =

-            (RDCOST(cpi->RDMULT, cpi->RDDIV, rate, err));

-        mcomp_filter_index++;

-        if (mcomp_filter_index < mcomp_filters) {

-          cm->mcomp_filter_type = mcomp_filters_to_search[mcomp_filter_index];

-          loop_count = -1;

-          loop = 1;

-        } else {

-          int f;

-          int64_t best_cost = mcomp_filter_cost[0];

-          int mcomp_best_filter = mcomp_filters_to_search[0];

-          for (f = 1; f < mcomp_filters; f++) {

-            if (mcomp_filter_cost[f] < best_cost) {

-              mcomp_best_filter = mcomp_filters_to_search[f];

-              best_cost = mcomp_filter_cost[f];

-            }

-          }

-          if (mcomp_best_filter != mcomp_filters_to_search[mcomp_filters - 1]) {

-            loop_count = -1;

-            loop = 1;

-            cm->mcomp_filter_type = mcomp_best_filter;

-          }

-          /*

-             printf("  best filter = %d, ( ", mcomp_best_filter);

-             for (f=0;f<mcomp_filters; f++) printf("%d ",  mcomp_filter_cost[f]);

-             printf(")\n");

-             */

-        }

-#if RESET_FOREACH_FILTER

-        if (loop) {

-          overshoot_seen = 0;

-          undershoot_seen = 0;

-          q_low = q_low0;

-          q_high = q_high0;

-          q = Q0;

-          cpi->rate_correction_factor = rate_correction_factor0;

-          cpi->gf_rate_correction_factor = gf_rate_correction_factor0;

-          cpi->active_best_quality = active_best_quality0;

-          cpi->active_worst_quality = active_worst_quality0;

-        }

-#endif

-      }

-    }

     if (loop) {

       loop_count++;

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

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

@@ -258,7 +258,6 @@

   int reduce_first_step_size;

   int auto_mv_step_size;

   int optimize_coefficients;

-  int search_best_filter;

   int static_segmentation;

   int comp_inter_joint_search_thresh;

   int adaptive_rd_thresh;