shithub: libvpx

Download patch

ref: fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7
parent: a53b7e53e8eaf121c16a7f93117f85f38e5bd591
author: angiebird <[email protected]>
date: Thu Dec 12 07:15:33 EST 2019 

Cosmetic change of vp9_get_gop_coding_frame_count

Move the output parameter to the end.

Change-Id: I39c718b683a76cd7c5998724c3a07e88275198bf


--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -3669,16 +3669,18 @@
   }
 
   *coding_frame_count = vp9_get_gop_coding_frame_count(
-      use_alt_ref, &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info,
-      &rc, *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,
-      last_gop_use_alt_ref);
+      &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info, &rc,
+      *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,
+      last_gop_use_alt_ref, use_alt_ref);
 }
 
-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 vp9_get_gop_coding_frame_count(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 *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;
@@ -3727,9 +3729,8 @@
     }
 
     gop_coding_frame_count = vp9_get_gop_coding_frame_count(
-        &use_alt_ref, oxcf, frame_info, first_pass_info, &rc, show_idx,
-        multi_layer_arf, allow_alt_ref, first_is_key_frame,
-        last_gop_use_alt_ref);
+        oxcf, frame_info, first_pass_info, &rc, show_idx, multi_layer_arf,
+        allow_alt_ref, first_is_key_frame, last_gop_use_alt_ref, &use_alt_ref);
 
     rc.source_alt_ref_active = use_alt_ref;
     last_gop_use_alt_ref = use_alt_ref;
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -279,11 +279,13 @@
  *
  * \return Returns coding frame count
  */
-int vp9_get_gop_coding_frame_count(
-    int *use_alt_ref, const struct 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 vp9_get_gop_coding_frame_count(const struct 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 *use_alt_ref);
 
 int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,
                              const FRAME_INFO *frame_info,