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
3669 }3669 }
3670 3670
3671 *coding_frame_count = vp9_get_gop_coding_frame_count(3671 *coding_frame_count = vp9_get_gop_coding_frame_count(
3672 use_alt_ref, &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info,3672 &cpi->oxcf, &cpi->frame_info, &cpi->twopass.first_pass_info, &rc,
3673 &rc, *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,3673 *first_show_idx, multi_layer_arf, allow_alt_ref, *first_is_key_frame,
3674 last_gop_use_alt_ref);3674 last_gop_use_alt_ref, use_alt_ref);
3675}3675}
3676 3676
3677int vp9_get_gop_coding_frame_count(3677int vp9_get_gop_coding_frame_count(const VP9EncoderConfig *oxcf,
3678 int *use_alt_ref, const VP9EncoderConfig *oxcf,3678 const FRAME_INFO *frame_info,
3679 const FRAME_INFO *frame_info, const FIRST_PASS_INFO *first_pass_info,3679 const FIRST_PASS_INFO *first_pass_info,
3680 const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,3680 const RATE_CONTROL *rc, int show_idx,
3681 int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref) {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) {
3682 int frame_count;3684 int frame_count;
3683 double gop_intra_factor;3685 double gop_intra_factor;
3684 const int arf_active_or_kf = last_gop_use_alt_ref || first_is_key_frame;3686 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
3727 }3729 }
3728 3730
3729 gop_coding_frame_count = vp9_get_gop_coding_frame_count(3731 gop_coding_frame_count = vp9_get_gop_coding_frame_count(
3730 &use_alt_ref, oxcf, frame_info, first_pass_info, &rc, show_idx,3732 oxcf, frame_info, first_pass_info, &rc, show_idx, multi_layer_arf,
3731 multi_layer_arf, allow_alt_ref, first_is_key_frame,3733 allow_alt_ref, first_is_key_frame, last_gop_use_alt_ref, &use_alt_ref);
3732 last_gop_use_alt_ref);
3733 3734
3734 rc.source_alt_ref_active = use_alt_ref;3735 rc.source_alt_ref_active = use_alt_ref;
3735 last_gop_use_alt_ref = use_alt_ref;3736 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
279 *279 *
280 * \return Returns coding frame count280 * \return Returns coding frame count
281 */281 */
282int vp9_get_gop_coding_frame_count(282int vp9_get_gop_coding_frame_count(const struct VP9EncoderConfig *oxcf,
283 int *use_alt_ref, const struct VP9EncoderConfig *oxcf,283 const FRAME_INFO *frame_info,
284 const FRAME_INFO *frame_info, const FIRST_PASS_INFO *first_pass_info,284 const FIRST_PASS_INFO *first_pass_info,
285 const RATE_CONTROL *rc, int show_idx, int multi_layer_arf,285 const RATE_CONTROL *rc, int show_idx,
286 int allow_alt_ref, int first_is_key_frame, int last_gop_use_alt_ref);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);
287 289
288int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,290int vp9_get_coding_frame_num(const struct VP9EncoderConfig *oxcf,
289 const FRAME_INFO *frame_info,291 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