diff options
| author | angiebird <angiebird@google.com> | 2020-10-09 17:47:02 -0700 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2020-10-09 19:09:36 -0700 |
| commit | 9857515cd6deae3e981792c74613e0dac624db56 (patch) | |
| tree | 3e7d70f2b089061441b7cdef49c263bb9247978e /vp9/encoder | |
| parent | 705bf9de8c96cfe5301451f1d7e5c90a41c64e5f (diff) | |
| download | libvpx-9857515cd6deae3e981792c74613e0dac624db56.tar libvpx-9857515cd6deae3e981792c74613e0dac624db56.tar.gz libvpx-9857515cd6deae3e981792c74613e0dac624db56.tar.bz2 libvpx-9857515cd6deae3e981792c74613e0dac624db56.zip | |
Call vp9_extrc_send_firstpass_stats() properly
Change-Id: I28db5010ba647cc91b8c0aa59309d7e953cd1216
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ext_ratectrl.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ext_ratectrl.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 80bc4355b..251a834d1 100644 --- 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 f253f5c22..51139f6ac 100644 --- 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 b04598cd4..77d3bdd99 100644 --- 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_ |