shithub: libvpx

Info  •  Files  •  Log  •  Branches

Moving frame_is_boosted() to vp9_speed_features.c.

Change-Id: I9261ded5fbba7a625d8224d91be296265a932410

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -495,14 +495,6 @@

       .buf;

 }

-// Intra only frames, golden frames (except alt ref overlays) and

-// alt ref frames tend to be coded at a higher than ambient quality

-static INLINE int frame_is_boosted(const VP9_COMP *cpi) {

-  return frame_is_intra_only(&cpi->common) || cpi->refresh_alt_ref_frame ||

-         (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref) ||

-         vp9_is_upper_layer_key_frame(cpi);

-}

-

 static INLINE int get_token_alloc(int mb_rows, int mb_cols) {

   // TODO(JBB): double check we can't exceed this token count if we have a

   // 32x32 transform crossing a boundary at a multiple of 16.

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

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

@@ -50,8 +50,20 @@

                               (1 << THR_GOLD)

 };

+// Intra only frames, golden frames (except alt ref overlays) and

+// alt ref frames tend to be coded at a higher than ambient quality

+static int frame_is_boosted(const VP9_COMP *cpi) {

+  return frame_is_intra_only(&cpi->common) ||

+         cpi->refresh_alt_ref_frame ||

+         (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref) ||

+         vp9_is_upper_layer_key_frame(cpi);

+}

+

+

 static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,

                                    SPEED_FEATURES *sf, int speed) {

+  const int boosted = frame_is_boosted(cpi);

+

   sf->adaptive_rd_thresh = 1;

   sf->recode_loop = (speed < 1) ? ALLOW_RECODE : ALLOW_RECODE_KFMAXBW;

   sf->allow_skip_recode = 1;

@@ -120,10 +132,10 @@

       sf->disable_split_mask = DISABLE_ALL_INTER_SPLIT;

     }

     sf->adaptive_pred_interp_filter = 0;

-    sf->cb_partition_search = frame_is_boosted(cpi) ? 0 : 1;

+    sf->cb_partition_search = !boosted;

     sf->cb_pred_filter_search = 1;

     sf->alt_ref_search_fp = 1;

-    sf->motion_field_mode_search = frame_is_boosted(cpi) ? 0 : 1;

+    sf->motion_field_mode_search = !boosted;

     sf->lf_motion_threshold = LOW_MOTION_THRESHOLD;

     sf->last_partitioning_redo_frequency = 3;

     sf->recode_loop = ALLOW_RECODE_KFMAXBW;