diff options
| author | angiebird <angiebird@google.com> | 2019-12-12 12:15:33 -0800 |
|---|---|---|
| committer | angiebird <angiebird@google.com> | 2019-12-12 12:15:33 -0800 |
| commit | fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7 (patch) | |
| tree | 9ecacc17d44f12fc67f60823ed0e62fea4e21de1 /vp9/encoder | |
| parent | a53b7e53e8eaf121c16a7f93117f85f38e5bd591 (diff) | |
| download | libvpx-fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7.tar libvpx-fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7.tar.gz libvpx-fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7.tar.bz2 libvpx-fadfea8a6abb3a100fc63788ec0f4d14ee26b0f7.zip | |
Cosmetic change of vp9_get_gop_coding_frame_count
Move the output parameter to the end.
Change-Id: I39c718b683a76cd7c5998724c3a07e88275198bf
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 27 | ||||
| -rw-r--r-- | vp9/encoder/vp9_firstpass.h | 12 |
2 files changed, 21 insertions, 18 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 4071da5a1..cfaa68cfa 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -3669,16 +3669,18 @@ void vp9_get_next_group_of_picture(const VP9_COMP *cpi, int *first_is_key_frame, } *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); -} - -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) { + &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(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 @@ int vp9_get_coding_frame_num(const VP9EncoderConfig *oxcf, } 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; diff --git a/vp9/encoder/vp9_firstpass.h b/vp9/encoder/vp9_firstpass.h index f27dfe9a6..8462cb05c 100644 --- a/vp9/encoder/vp9_firstpass.h +++ b/vp9/encoder/vp9_firstpass.h @@ -279,11 +279,13 @@ void vp9_get_next_group_of_picture(const struct VP9_COMP *cpi, * * \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, |