History

Cosmetic change of vp9_get_gop_coding_frame_count

Move the output parameter to the end.

angiebird committed 6 years ago

Commit fadfea81 parent a53b7e52 files · +21 −18Browse files

Unified · Split

2 files
  1. vp9/encoder/vp9_firstpass.c +14 −13
  2. vp9/encoder/vp9_firstpass.h +7 −5
vp9/encoder/vp9_firstpass.c+14−13
@@ -3669,16 +3669,18 @@ void vp9_get_next_group_of_picture(const VP9_COMP *cpi, int *first_is_key_frame, · 3668 unmodified lines
36693669 }
36703670
36713671 *coding_frame_count = vp9_get_gop_coding_frame_count(
3672− use_alt_ref, &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info,
3673− &rc, *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,
3674− last_gop_use_alt_ref);
3675−}
3676−
3677−int vp9_get_gop_coding_frame_count(
3678− int *use_alt_ref, const VP9EncoderConfig *oxcf,
3679− const FRAME_INFO *frame_info, const FIRST_PASS_INFO *first_pass_info,
3680− const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,
3681− int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref) {
3672+ &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info, &rc,
3673+ *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,
3674+ last_gop_use_alt_ref, use_alt_ref);
3675+}
3676+
3677+int vp9_get_gop_coding_frame_count(const VP9EncoderConfig *oxcf,
3678+ const FRAME_INFO *frame_info,
3679+ const FIRST_PASS_INFO *first_pass_info,
3680+ const RATE_CONTROL *rc, int show_idx,
3681+ int multi_layer_arf, int allow_alt_ref,
3682+ int first_is_key_frame,
3683+ int last_gop_use_alt_ref, int *use_alt_ref) {
36823684 int frame_count;
36833685 double gop_intra_factor;
36843686 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, · 42 unmodified lines
37273729 }
37283730
37293731 gop_coding_frame_count = vp9_get_gop_coding_frame_count(
3730− &use_alt_ref, oxcf, frame_info, first_pass_info, &rc, show_idx,
3731− multi_layer_arf, allow_alt_ref, first_is_key_frame,
3732− last_gop_use_alt_ref);
3732+ oxcf, frame_info, first_pass_info, &rc, show_idx, multi_layer_arf,
3733+ allow_alt_ref, first_is_key_frame, last_gop_use_alt_ref, &use_alt_ref);
37333734
37343735 rc.source_alt_ref_active = use_alt_ref;
37353736 last_gop_use_alt_ref = use_alt_ref;
vp9/encoder/vp9_firstpass.h+7−5
@@ -279,11 +279,13 @@ void vp9_get_next_group_of_picture(const struct VP9_COMP *cpi, · 278 unmodified lines
279279 *
280280 * \return Returns coding frame count
281281 */
282−int vp9_get_gop_coding_frame_count(
283− int *use_alt_ref, const struct VP9EncoderConfig *oxcf,
284− const FRAME_INFO *frame_info, const FIRST_PASS_INFO *first_pass_info,
285− const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,
286− int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref);
282+int vp9_get_gop_coding_frame_count(const struct VP9EncoderConfig *oxcf,
283+ const FRAME_INFO *frame_info,
284+ const FIRST_PASS_INFO *first_pass_info,
285+ const RATE_CONTROL *rc, int show_idx,
286+ int multi_layer_arf, int allow_alt_ref,
287+ int first_is_key_frame,
288+ int last_gop_use_alt_ref, int *use_alt_ref);
287289
288290 int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,
289291 const FRAME_INFO *frame_info,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t