Simplify the logics of computing gf_group_err etc

Move the logics of computing gf_group_err, gf_group_raw_error, gf_group_noise, gf_group_skip_pct, gf_group_inactive_zone_rowsa, gf_group_inter, gf_group_motion into one for loop The behavior stays the same.

angiebird committed 7 years ago

Commit b255d471 parent 821db082 files · +36 −28Browse files

Unified · Split

2 files

vp9/encoder/vp9_firstpass.c +28 −28
vp9/encoder/vp9_firstpass.h +8 −0

vp9/encoder/vp9_firstpass.c+28−28

 #define ARF_ABS_ZOOM_THRESH 4.0
 #define MAX_GF_BOOST 5400
-static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
+static void define_gf_group(VP9_COMP *cpi) {
   VP9_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
   VP9EncoderConfig *const oxcf = &cpi->oxcf;
   TWO_PASS *const twopass = &cpi->twopass;
   const FRAME_INFO *frame_info = &cpi->frame_info;
+  const FIRST_PASS_INFO *first_pass_info = &twopass->first_pass_info;
   FIRSTPASS_STATS next_frame;
   const FIRSTPASS_STATS *const start_pos = twopass->stats_in;
+  const int gf_start_show_idx = cm->current_video_frame;
   int i;
+  int j;
   double gf_group_err = 0.0;
   double gf_group_raw_error = 0.0;
   int64_t gf_group_bits;
   int gf_arf_bits;
   const int is_key_frame = frame_is_intra_only(cm);
+  // If this is a key frame or the overlay from a previous arf then
+  // the error score / cost of this frame has already been accounted for.
   const int arf_active_or_kf = is_key_frame || rc->source_alt_ref_active;
   int is_alt_ref_flash = 0;
   vpx_clear_system_state();
   vp9_zero(next_frame);
-  // If this is a key frame or the overlay from a previous arf then
-  // the error score / cost of this frame has already been accounted for.
-  if (arf_active_or_kf) {
-    double gf_first_frame_err = calc_norm_frame_score(
-        oxcf, frame_info, this_frame, mean_mod_score, av_err);
-    gf_group_err -= gf_first_frame_err;
-    gf_group_raw_error -= this_frame->coded_error;
-    gf_group_noise -= this_frame->frame_noise_energy;
-    gf_group_skip_pct -= this_frame->intra_skip_pct;
-    gf_group_inactive_zone_rows -= this_frame->inactive_zone_rows;
-    gf_group_inter -= this_frame->pcnt_inter;
-    gf_group_motion -= this_frame->pcnt_motion;
-  }
   // Motion breakout threshold for loop below depends on image size.
   mv_ratio_accumulator_thresh =
       (cpi->initial_height + cpi->initial_width) / 4.0;
     const FIRSTPASS_STATS *next_next_frame;
     ++i;
-    // Accumulate error score of frames in this gf group.
-    gf_group_err += calc_norm_frame_score(oxcf, frame_info, this_frame,
-                                          mean_mod_score, av_err);
-    gf_group_raw_error += this_frame->coded_error;
-    gf_group_noise += this_frame->frame_noise_energy;
-    gf_group_skip_pct += this_frame->intra_skip_pct;
-    gf_group_inactive_zone_rows += this_frame->inactive_zone_rows;
-    gf_group_inter += this_frame->pcnt_inter;
-    gf_group_motion += this_frame->pcnt_motion;
     if (EOF == input_stats(twopass, &next_frame)) break;
     // Test for the case where there is a brief flash but the prediction
          (sr_accumulator > gop_intra_factor * next_frame.intra_error))) {
       break;
     }
-    *this_frame = next_frame;
   }
   // Was the group length constrained by the requirement for a new KF?
   if (rc->source_alt_ref_pending)
     is_alt_ref_flash = detect_flash(twopass, rc->baseline_gf_interval);
+  {
+    // If the first frame is a key frame or the overlay from a previous arf then
+    // the error score / cost of this frame has already been accounted for.
+    int start_idx = arf_active_or_kf ? 1 : 0;
+    int num_show_frames = i;
+    for (j = start_idx; j < num_show_frames; ++j) {
+      int show_idx = gf_start_show_idx + j;
+      const FIRSTPASS_STATS *frame_stats =
+          fps_get_frame_stats(first_pass_info, show_idx);
+      // Accumulate error score of frames in this gf group.
+      gf_group_err += calc_norm_frame_score(oxcf, frame_info, frame_stats,
+                                            mean_mod_score, av_err);
+      gf_group_raw_error += frame_stats->coded_error;
+      gf_group_noise += frame_stats->frame_noise_energy;
+      gf_group_skip_pct += frame_stats->intra_skip_pct;
+      gf_group_inactive_zone_rows += frame_stats->inactive_zone_rows;
+      gf_group_inter += frame_stats->pcnt_inter;
+      gf_group_motion += frame_stats->pcnt_motion;
+    }
+  }
   // Calculate the bits to be allocated to the gf/arf group as a whole
   gf_group_bits = calculate_total_gf_group_bits(cpi, gf_group_err);
   // Define a new GF/ARF group. (Should always enter here for key frames).
   if (rc->frames_till_gf_update_due == 0) {
-    define_gf_group(cpi, &this_frame);
+    define_gf_group(cpi);
     rc->frames_till_gf_update_due = rc->baseline_gf_interval;

vp9/encoder/vp9_firstpass.h+8−0

@@ -158,6 +158,14 @@ static INLINE void fps_init_first_pass_info(FIRST_PASS_INFO *first_pass_info, · 157 unmodified lines
158	first_pass_info->num_frames = num_frames;	158	first_pass_info->num_frames = num_frames;
159	}	159	}
160		160
		161	static INLINE const FIRSTPASS_STATS *fps_get_frame_stats(
		162	const FIRST_PASS_INFO *first_pass_info, int show_idx) {
		163	if (show_idx >= first_pass_info->num_frames) {
		164	return NULL;
		165	}
		166	return &first_pass_info->stats[show_idx];
		167	}
		168
161	typedef struct {	169	typedef struct {
162	unsigned int section_intra_rating;	170	unsigned int section_intra_rating;
163	unsigned int key_frame_section_intra_rating;	171	unsigned int key_frame_section_intra_rating;

Simplify the logics of computing gf_group_err etc

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code