Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
cd6b9936
Commit
cd6b9936
authored
Feb 14, 2014
by
Jim Bankoski
Committed by
Gerrit Code Review
Feb 14, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "vp9_ratectrl.h resolve visual studio warnings"
parents
5cc0de90
e5dda3b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_firstpass.c
+2
-2
vp9/encoder/vp9_ratectrl.h
vp9/encoder/vp9_ratectrl.h
+11
-11
No files found.
vp9/encoder/vp9_firstpass.c
View file @
cd6b9936
...
...
@@ -1453,8 +1453,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
active_max_gf_interval
=
12
+
((
int
)
vp9_convert_qindex_to_q
(
rc
->
last_q
[
INTER_FRAME
])
>>
5
);
if
(
active_max_gf_interval
>
(
int
)
rc
->
max_gf_interval
)
active_max_gf_interval
=
(
int
)
rc
->
max_gf_interval
;
if
(
active_max_gf_interval
>
rc
->
max_gf_interval
)
active_max_gf_interval
=
rc
->
max_gf_interval
;
i
=
0
;
while
(
i
<
twopass
->
static_scene_max_gf_interval
&&
...
...
vp9/encoder/vp9_ratectrl.h
View file @
cd6b9936
...
...
@@ -34,17 +34,17 @@ typedef struct {
double
key_frame_rate_correction_factor
;
double
gf_rate_correction_factor
;
unsigned
int
frames_since_golden
;
unsigned
int
frames_till_gf_update_due
;
// Count down till next GF
unsigned
int
max_gf_interval
;
unsigned
int
baseline_gf_interval
;
unsigned
int
frames_to_key
;
unsigned
int
frames_since_key
;
unsigned
int
this_key_frame_forced
;
unsigned
int
next_key_frame_forced
;
unsigned
int
source_alt_ref_pending
;
unsigned
int
source_alt_ref_active
;
unsigned
int
is_src_frame_alt_ref
;
int
frames_since_golden
;
int
frames_till_gf_update_due
;
int
max_gf_interval
;
int
baseline_gf_interval
;
int
frames_to_key
;
int
frames_since_key
;
int
this_key_frame_forced
;
int
next_key_frame_forced
;
int
source_alt_ref_pending
;
int
source_alt_ref_active
;
int
is_src_frame_alt_ref
;
int
av_per_frame_bandwidth
;
// Average frame size target for clip
int
min_frame_bandwidth
;
// Minimum allocation used for any frame
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment