shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Use more meaningful names for speed features"

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

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

@@ -2550,7 +2550,7 @@

           vp9_tile_init(&tile, cm, tile_row, tile_col);

           for (mi_row = tile.mi_row_start;

                mi_row < tile.mi_row_end; mi_row += 8) {

-            if (cpi->sf.super_fast_rtc)

+            if (cpi->sf.use_pick_mode)

               encode_rtc_sb_row(cpi, &tile, mi_row, &tp);

             else

               encode_sb_row(cpi, &tile, mi_row, &tp);

@@ -2608,7 +2608,7 @@

     }

   }

-  if (cpi->sf.RD) {

+  if (cpi->sf.frame_parameter_update) {

     int i;

     REFERENCE_MODE reference_mode;

     /*

@@ -2815,7 +2815,7 @@

   const int mi_height = num_8x8_blocks_high_lookup[bsize];

   x->skip_recode = !x->select_txfm_size && mbmi->sb_type >= BLOCK_8X8 &&

                    (cpi->oxcf.aq_mode != COMPLEXITY_AQ) &&

-                   !cpi->sf.super_fast_rtc;

+                   !cpi->sf.use_pick_mode;

   x->skip_optimize = ctx->is_coded;

   ctx->is_coded = 1;

   x->use_lp32x32fdct = cpi->sf.use_lp32x32fdct;

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

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

@@ -842,11 +842,11 @@

       sf->intra_y_mode_mask[i] = INTRA_DC_H_V;

       sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY;

     }

-    sf->RD = 0;

+    sf->frame_parameter_update = 0;

   }

   if (speed >= 6) {

-    sf->super_fast_rtc = 1;

     sf->always_this_block_size = BLOCK_16X16;

+    sf->use_pick_mode = 1;

   }

 }

@@ -864,7 +864,7 @@

     cpi->mode_chosen_counts[i] = 0;

   // best quality defaults

-  sf->RD = 1;

+  sf->frame_parameter_update = 1;

   sf->search_method = NSTEP;

   sf->recode_loop = ALLOW_RECODE;

   sf->subpel_search_method = SUBPEL_TREE;

@@ -905,7 +905,7 @@

   sf->use_fast_coef_updates = 0;

   sf->using_small_partition_info = 0;

   sf->mode_skip_start = MAX_MODES;  // Mode index at which mode skip mask set

-  sf->super_fast_rtc = 0;

+  sf->use_pick_mode = 0;

   switch (cpi->oxcf.mode) {

     case MODE_BESTQUALITY:

@@ -2875,7 +2875,7 @@

     if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) {

       vp9_save_coding_context(cpi);

       cpi->dummy_packing = 1;

-      if (!cpi->sf.super_fast_rtc)

+      if (!cpi->sf.use_pick_mode)

         vp9_pack_bitstream(cpi, dest, size);

       cpi->rc.projected_frame_size = (*size) << 3;

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

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

@@ -209,8 +209,8 @@

 } RECODE_LOOP_TYPE;

 typedef struct {

-  // This flag refers to whether or not to perform rd optimization.

-  int RD;

+  // Frame level coding parameter update

+  int frame_parameter_update;

   // Motion search method (Diamond, NSTEP, Hex, Big Diamond, Square, etc).

   SEARCH_METHODS search_method;

@@ -390,8 +390,8 @@

   // by only looking at counts from 1/2 the bands.

   int use_fast_coef_updates;  // 0: 2-loop, 1: 1-loop, 2: 1-loop reduced

-  // This flag control the use of the new super fast rtc mode

-  int super_fast_rtc;

+  // This flag controls the use of non-RD mode decision.

+  int use_pick_mode;

 } SPEED_FEATURES;

 typedef struct {

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -864,7 +864,7 @@

   // JBB : This is realtime mode.  In real time mode the first frame

   // should be larger. Q of 0 is disabled because we force tx size to be

   // 16x16...

-  if (cpi->sf.super_fast_rtc) {

+  if (cpi->sf.use_pick_mode) {

     if (cpi->common.current_video_frame == 0)

       q /= 3;

     if (q == 0)

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

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

@@ -296,7 +296,7 @@

   fill_token_costs(x->token_costs, cm->fc.coef_probs);

-  if (!cpi->sf.super_fast_rtc) {

+  if (!cpi->sf.use_pick_mode) {

     for (i = 0; i < PARTITION_CONTEXTS; i++)

       vp9_cost_tokens(x->partition_cost[i], get_partition_probs(cm, i),

                       vp9_partition_tree);

@@ -443,7 +443,7 @@

     if (i == 0)

       x->pred_sse[ref] = sse;

-    if (cpi->sf.super_fast_rtc) {

+    if (cpi->sf.use_pick_mode) {

       dist_sum += (int)sse;

     } else {

       int rate;