Call vp9_extrc_send_firstpass_stats() properly

Change-Id: I28db5010ba647cc91b8c0aa59309d7e953cd1216

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 80bc4355b09c48c6b8b1162fab5d0a060d293f4e..251a834d13f74af9300491585e81f7062b3a9c05 100644 (file)
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2463,6 +2463,8 @@ VP9_COMP *vp9_create_compressor(const VP9EncoderConfig *oxcf,
 
   cpi->allow_encode_breakout = ENCODE_BREAKOUT_ENABLED;
 
+  vp9_extrc_init(&cpi->ext_ratectrl);
+
 #if !CONFIG_REALTIME_ONLY
   if (oxcf->pass == 1) {
     vp9_init_first_pass(cpi);
@@ -2536,6 +2538,8 @@ VP9_COMP *vp9_create_compressor(const VP9EncoderConfig *oxcf,
       num_frames = packets - 1;
       fps_init_first_pass_info(&cpi->twopass.first_pass_info,
                                oxcf->two_pass_stats_in.buf, num_frames);
+      vp9_extrc_send_firstpass_stats(&cpi->ext_ratectrl,
+                                     &cpi->twopass.first_pass_info);
 
       vp9_init_second_pass(cpi);
     }
@@ -2664,7 +2668,6 @@ VP9_COMP *vp9_create_compressor(const VP9EncoderConfig *oxcf,
   motion_vector_info_init(cpi);
   fp_motion_vector_info_init(cpi);
 #endif
-  vp9_extrc_init(&cpi->ext_ratectrl);
 
   return cpi;
 }

diff --git a/vp9/encoder/vp9_ext_ratectrl.c b/vp9/encoder/vp9_ext_ratectrl.c
index f253f5c22631ea9c1772d986dca1e25e89097026..51139f6ace7e2533be5f5edfed58b46ebde25f50 100644 (file)
--- a/vp9/encoder/vp9_ext_ratectrl.c
+++ b/vp9/encoder/vp9_ext_ratectrl.c
@@ -66,8 +66,8 @@ static void gen_rc_firstpass_stats(const FIRSTPASS_STATS *stats,
   rc_frame_stats->count = stats->count;
 }
 
-void vp9_extrc_send_firstpass_stats(const FIRST_PASS_INFO *first_pass_info,
-                                    EXT_RATECTRL *ext_ratectrl) {
+void vp9_extrc_send_firstpass_stats(EXT_RATECTRL *ext_ratectrl,
+                                    const FIRST_PASS_INFO *first_pass_info) {
   if (ext_ratectrl->ready) {
     vpx_rc_firstpass_stats_t *rc_firstpass_stats =
         &ext_ratectrl->rc_firstpass_stats;

diff --git a/vp9/encoder/vp9_ext_ratectrl.h b/vp9/encoder/vp9_ext_ratectrl.h
index b04598cd45b1941cc9db19fdf7694ddf316ea180..77d3bdd99fe46c0c939ff723024804bd1f92f606 100644 (file)
--- a/vp9/encoder/vp9_ext_ratectrl.h
+++ b/vp9/encoder/vp9_ext_ratectrl.h
@@ -29,7 +29,7 @@ void vp9_extrc_create(vpx_rc_funcs_t funcs, vpx_rc_config_t ratectrl_config,
 
 void vp9_extrc_delete(EXT_RATECTRL *ext_ratectrl);
 
-void vp9_extrc_send_firstpass_stats(const FIRST_PASS_INFO *first_pass_info,
-                                    EXT_RATECTRL *ext_ratectrl);
+void vp9_extrc_send_firstpass_stats(EXT_RATECTRL *ext_ratectrl,
+                                    const FIRST_PASS_INFO *first_pass_info);
 
 #endif  // VPX_VP9_ENCODER_VP9_EXT_RATECTRL_H_