shithub: libvpx

Info  •  Files  •  Log  •  Branches

Cleaning up encode_frame_internal().

Change-Id: I9c5f7edc2d5d1ec5aee396b87bdfc99ee21c435a

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

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

@@ -3040,15 +3040,11 @@

 // end RTC play code

 static void encode_frame_internal(VP9_COMP *cpi) {

-  int mi_row;

+  SPEED_FEATURES *const sf = &cpi->sf;

   MACROBLOCK *const x = &cpi->mb;

   VP9_COMMON *const cm = &cpi->common;

   MACROBLOCKD *const xd = &x->e_mbd;

-//  fprintf(stderr, "encode_frame_internal frame %d (%d) type %d\n",

-//           cpi->common.current_video_frame, cpi->common.show_frame,

-//           cm->frame_type);

-

   xd->mi = cm->mi_grid_visible;

   xd->mi[0] = cm->mi;

@@ -3055,12 +3051,17 @@

   vp9_zero(cm->counts);

   vp9_zero(cpi->coef_counts);

   vp9_zero(cpi->tx_stepdown_count);

+  vp9_zero(cpi->rd_comp_pred_diff);

+  vp9_zero(cpi->rd_filter_diff);

+  vp9_zero(cpi->rd_tx_select_diff);

+  vp9_zero(cpi->rd_tx_select_threshes);

-  // Set frame level transform size use case

   cm->tx_mode = select_tx_mode(cpi);

-  cpi->mb.e_mbd.lossless = cm->base_qindex == 0 && cm->y_dc_delta_q == 0

-      && cm->uv_dc_delta_q == 0 && cm->uv_ac_delta_q == 0;

+  cpi->mb.e_mbd.lossless = cm->base_qindex == 0 &&

+                           cm->y_dc_delta_q == 0 &&

+                           cm->uv_dc_delta_q == 0 &&

+                           cm->uv_ac_delta_q == 0;

   switch_lossless_mode(cpi, cpi->mb.e_mbd.lossless);

   vp9_frame_init_quantizer(cpi);

@@ -3067,26 +3068,14 @@

   vp9_initialize_rd_consts(cpi);

   vp9_initialize_me_consts(cpi, cm->base_qindex);

+  init_encode_frame_mb_context(cpi);

-  if (cpi->oxcf.tuning == VP8_TUNE_SSIM) {

-    // Initialize encode frame context.

-    init_encode_frame_mb_context(cpi);

-

-    // Build a frame level activity map

+  if (cpi->oxcf.tuning == VP8_TUNE_SSIM)

     build_activity_map(cpi);

-  }

-  // Re-initialize encode frame context.

-  init_encode_frame_mb_context(cpi);

-

-  vp9_zero(cpi->rd_comp_pred_diff);

-  vp9_zero(cpi->rd_filter_diff);

-  vp9_zero(cpi->rd_tx_select_diff);

-  vp9_zero(cpi->rd_tx_select_threshes);

-

   set_prev_mi(cm);

-  if (cpi->sf.use_nonrd_pick_mode) {

+  if (sf->use_nonrd_pick_mode) {

     // Initialize internal buffer pointers for rtc coding, where non-RD

     // mode decision is used and hence no buffer pointer swap needed.

     int i;

@@ -3118,12 +3107,13 @@

         for (tile_col = 0; tile_col < tile_cols; tile_col++) {

           TileInfo tile;

           TOKENEXTRA *tp_old = tp;

+          int mi_row;

           // For each row of SBs in the frame

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

           for (mi_row = tile.mi_row_start;

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

-            if (cpi->sf.use_nonrd_pick_mode && cm->frame_type != KEY_FRAME)

+            if (sf->use_nonrd_pick_mode && cm->frame_type != KEY_FRAME)

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

             else

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

@@ -3138,7 +3128,7 @@

     cpi->time_encode_sb_row += vpx_usec_timer_elapsed(&emr_timer);

   }

-  if (cpi->sf.skip_encode_sb) {

+  if (sf->skip_encode_sb) {

     int j;

     unsigned int intra_count = 0, inter_count = 0;

     for (j = 0; j < INTRA_INTER_CONTEXTS; ++j) {

@@ -3145,11 +3135,11 @@

       intra_count += cm->counts.intra_inter[j][0];

       inter_count += cm->counts.intra_inter[j][1];

     }

-    cpi->sf.skip_encode_frame = (intra_count << 2) < inter_count &&

-                                cm->frame_type != KEY_FRAME &&

-                                cm->show_frame;

+    sf->skip_encode_frame = (intra_count << 2) < inter_count &&

+                            cm->frame_type != KEY_FRAME &&

+                            cm->show_frame;

   } else {

-    cpi->sf.skip_encode_frame = 0;

+    sf->skip_encode_frame = 0;

   }

 #if 0