Add vp9_get_gop_coding_frame_count()

Call this function before coding a new group of picture to get information about it.

angiebird committed 6 years ago

Commit c33f8591 parent 94fb57d2 files · +61 −30Browse files

Unified · Split

2 files

vp9/encoder/vp9_firstpass.c +39 −30
vp9/encoder/vp9_firstpass.h +22 −0

 }
 #if CONFIG_RATE_CTRL
+int vp9_get_gop_coding_frame_count(
+    int *use_alt_ref, const VP9EncoderConfig *oxcf,
+    const FRAME_INFO *frame_info, const FIRST_PASS_INFO *first_pass_info,
+    const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,
+    int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref) {
+  int frame_count;
+  double gop_intra_factor;
+  const int arf_active_or_kf = last_gop_use_alt_ref || first_is_key_frame;
+  RANGE active_gf_interval = get_active_gf_inverval_range(
+      frame_info, rc, arf_active_or_kf, show_idx, /*active_worst_quality=*/0,
+      /*last_boosted_qindex=*/0);
+  const int arf_layers = get_arf_layers(multi_layer_arf, oxcf->enable_auto_arf,
+                                        active_gf_interval.max);
+  if (multi_layer_arf) {
+    gop_intra_factor = 1.0 + 0.25 * arf_layers;
+  } else {
+    gop_intra_factor = 1.0;
+  }
+  frame_count = get_gop_coding_frame_num(
+      use_alt_ref, frame_info, first_pass_info, rc, show_idx,
+      &active_gf_interval, gop_intra_factor, oxcf->lag_in_frames);
+  *use_alt_ref &= allow_alt_ref;
+  return frame_count;
+}
 // Under CONFIG_RATE_CTRL, once the first_pass_info is ready, the number of
 // coding frames (including show frame and alt ref) can be determined.
-int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,
+int vp9_get_coding_frame_num(const VP9EncoderConfig *oxcf,
                              const FRAME_INFO *frame_info,
                              const FIRST_PASS_INFO *first_pass_info,
                              int multi_layer_arf, int allow_alt_ref) {
   int coding_frame_num = 0;
   RATE_CONTROL rc;
-  RANGE active_gf_interval;
+  int gop_coding_frame_count;
-  int arf_layers;
-  double gop_intra_factor;
-  int use_alt_ref;
-  int gop_coding_frames;
   int gop_show_frames;
   int show_idx = 0;
-  int arf_active_or_kf = 1;
+  int last_gop_use_alt_ref = 0;
   rc.static_scene_max_gf_interval = 250;
   vp9_rc_init(oxcf, 1, &rc);
   while (show_idx < first_pass_info->num_frames) {
+    int use_alt_ref;
+    int first_is_key_frame = 0;
     if (rc.frames_to_key == 0) {
       rc.frames_to_key = vp9_get_frames_to_next_key(
           oxcf, frame_info, first_pass_info, show_idx, rc.min_gf_interval);
-      arf_active_or_kf = 1;
+      first_is_key_frame = 1;
-    } else {
-    }
-    {
-      int dummy = 0;
-      active_gf_interval = get_active_gf_inverval_range(
-          frame_info, &rc, arf_active_or_kf, show_idx, dummy, dummy);
     }
-    arf_layers = get_arf_layers(multi_layer_arf, oxcf->enable_auto_arf,
+    gop_coding_frame_count = vp9_get_gop_coding_frame_count(
-                                active_gf_interval.max);
+        &use_alt_ref, oxcf, frame_info, first_pass_info, &rc, show_idx,
-    if (multi_layer_arf) {
+        multi_layer_arf, allow_alt_ref, first_is_key_frame,
-      gop_intra_factor = 1.0 + 0.25 * arf_layers;
+        last_gop_use_alt_ref);
-    } else {
-      gop_intra_factor = 1.0;
-    }
-    gop_coding_frames = get_gop_coding_frame_num(
-        &use_alt_ref, frame_info, first_pass_info, &rc, show_idx,
-        &active_gf_interval, gop_intra_factor, oxcf->lag_in_frames);
-    use_alt_ref &= allow_alt_ref;
     rc.source_alt_ref_active = use_alt_ref;
-    arf_active_or_kf = use_alt_ref;
+    last_gop_use_alt_ref = use_alt_ref;
-    gop_show_frames = gop_coding_frames - use_alt_ref;
+    gop_show_frames = gop_coding_frame_count - use_alt_ref;
     rc.frames_to_key -= gop_show_frames;
     rc.frames_since_key += gop_show_frames;
     show_idx += gop_show_frames;

vp9/encoder/vp9_firstpass.h+22−0

@@ -252,6 +252,28 @@ int vp9_get_frames_to_next_key(const struct VP9EncoderConfig *oxcf, · 251 unmodified lines
252	const FIRST_PASS_INFO *first_pass_info,	252	const FIRST_PASS_INFO *first_pass_info,
253	int kf_show_idx, int min_gf_interval);	253	int kf_show_idx, int min_gf_interval);
254	#if CONFIG_RATE_CTRL	254	#if CONFIG_RATE_CTRL
		255	/*!\brief Call this function before coding a new group of pictures to get
		256	* information about it.
		257	* \param[in] oxcf Encoder config
		258	* \param[in] frame_info Frame info
		259	* \param[in] first_pass_info First pass stats
		260	* \param[in] rc Rate control state
		261	* \param[in] show_idx Show index of the first frame in the group
		262	* \param[in] multi_layer_arf Is multi-layer alternate reference used
		263	* \param[in] allow_alt_ref Is alternate reference allowed
		264	* \param[in] first_is_key_frame Is the first frame in the group a key frame
		265	* \param[in] last_gop_use_alt_ref Does the last group use alternate reference
		266	*
		267	* \param[out] use_alt_ref Does this group use alternate reference
		268	*
		269	* \return Returns coding frame count
		270	*/
		271	int vp9_get_gop_coding_frame_count(
		272	int use_alt_ref, const struct VP9EncoderConfig oxcf,
		273	const FRAME_INFO frame_info, const FIRST_PASS_INFO first_pass_info,
		274	const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,
		275	int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref);
		276
255	int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,	277	int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,
256	const FRAME_INFO *frame_info,	278	const FRAME_INFO *frame_info,
257	const FIRST_PASS_INFO *first_pass_info,	279	const FIRST_PASS_INFO *first_pass_info,

Add vp9_get_gop_coding_frame_count()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code