shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove a unused speed feature"

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

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

@@ -2060,17 +2060,6 @@

   save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize);

-  if (cpi->sf.disable_split_var_thresh && partition_none_allowed) {

-    unsigned int source_variancey;

-    vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);

-    source_variancey = get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize);

-    if (source_variancey < cpi->sf.disable_split_var_thresh) {

-      do_split = 0;

-      if (source_variancey < cpi->sf.disable_split_var_thresh / 2)

-        do_rect = 0;

-    }

-  }

-

 #if CONFIG_FP_MB_STATS

   if (cpi->use_fp_mb_stats) {

     set_offsets(cpi, tile, mi_row, mi_col, bsize);

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -362,7 +362,6 @@

   sf->mode_search_skip_flags = 0;

   sf->force_frame_boost = 0;

   sf->max_delta_qindex = 0;

-  sf->disable_split_var_thresh = 0;

   sf->disable_filter_search_var_thresh = 0;

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

     sf->intra_y_mode_mask[i] = INTRA_ALL;

--- a/vp9/encoder/vp9_speed_features.h

+++ b/vp9/encoder/vp9_speed_features.h

@@ -309,9 +309,6 @@

   // defined in the MODE_SEARCH_SKIP_HEURISTICS enum

   unsigned int mode_search_skip_flags;

-  // A source variance threshold below which the split mode is disabled

-  unsigned int disable_split_var_thresh;

-

   // A source variance threshold below which filter search is disabled

   // Choose a very large value (UINT_MAX) to use 8-tap always

   unsigned int disable_filter_search_var_thresh;