shithub: libvpx

Info  •  Files  •  Log  •  Branches

Simplifying vp9_set_speed_features() function.

Change-Id: I3e67230690b81ef54ef48ae26107fe7bc880ab8e

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -1018,10 +1018,6 @@

       vp9_sub_pixel_avg_variance4x4,

       vp9_sad4x4x3, vp9_sad4x4x8, vp9_sad4x4x4d)

-  cpi->full_search_sad = vp9_full_search_sad;

-  cpi->diamond_search_sad = vp9_diamond_search_sad;

-  cpi->refining_search_sad = vp9_refining_search_sad;

-

   /* vp9_init_quantizer() is first called here. Add check in

    * vp9_frame_init_quantizer() so that vp9_init_quantizer is only

    * called later when needed. This will avoid unnecessary calls of

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

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

@@ -388,20 +388,18 @@

   sf->recode_tolerance = 25;

   sf->default_interp_filter = SWITCHABLE;

-  switch (oxcf->mode) {

-    case ONE_PASS_BEST:

-    case TWO_PASS_SECOND_BEST:  // This is the best quality mode.

-      cpi->diamond_search_sad = vp9_full_range_search;

-      break;

-    case TWO_PASS_FIRST:

-    case ONE_PASS_GOOD:

-    case TWO_PASS_SECOND_GOOD:

+  if (oxcf->mode == REALTIME) {

+    set_rt_speed_feature(cpi, sf, oxcf->speed, oxcf->content);

+  } else {

+    if (!is_best_mode(oxcf->mode))

       set_good_speed_feature(cpi, cm, sf, oxcf->speed);

-      break;

-    case REALTIME:

-      set_rt_speed_feature(cpi, sf, oxcf->speed, oxcf->content);

-      break;

   }

+

+  cpi->full_search_sad = vp9_full_search_sad;

+  cpi->diamond_search_sad = is_best_mode(oxcf->mode) ? vp9_full_range_search

+                                                     : vp9_diamond_search_sad;

+  cpi->refining_search_sad = vp9_refining_search_sad;

+

   // Slow quant, dct and trellis not worthwhile for first pass

   // so make sure they are always turned off.