Commit cd6b9936 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "vp9_ratectrl.h resolve visual studio warnings"

parents 5cc0de90 e5dda3b6
...@@ -1453,8 +1453,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { ...@@ -1453,8 +1453,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
active_max_gf_interval = active_max_gf_interval =
12 + ((int)vp9_convert_qindex_to_q(rc->last_q[INTER_FRAME]) >> 5); 12 + ((int)vp9_convert_qindex_to_q(rc->last_q[INTER_FRAME]) >> 5);
if (active_max_gf_interval > (int)rc->max_gf_interval) if (active_max_gf_interval > rc->max_gf_interval)
active_max_gf_interval = (int)rc->max_gf_interval; active_max_gf_interval = rc->max_gf_interval;
i = 0; i = 0;
while (i < twopass->static_scene_max_gf_interval && while (i < twopass->static_scene_max_gf_interval &&
......
...@@ -34,17 +34,17 @@ typedef struct { ...@@ -34,17 +34,17 @@ typedef struct {
double key_frame_rate_correction_factor; double key_frame_rate_correction_factor;
double gf_rate_correction_factor; double gf_rate_correction_factor;
unsigned int frames_since_golden; int frames_since_golden;
unsigned int frames_till_gf_update_due; // Count down till next GF int frames_till_gf_update_due;
unsigned int max_gf_interval; int max_gf_interval;
unsigned int baseline_gf_interval; int baseline_gf_interval;
unsigned int frames_to_key; int frames_to_key;
unsigned int frames_since_key; int frames_since_key;
unsigned int this_key_frame_forced; int this_key_frame_forced;
unsigned int next_key_frame_forced; int next_key_frame_forced;
unsigned int source_alt_ref_pending; int source_alt_ref_pending;
unsigned int source_alt_ref_active; int source_alt_ref_active;
unsigned int is_src_frame_alt_ref; int is_src_frame_alt_ref;
int av_per_frame_bandwidth; // Average frame size target for clip int av_per_frame_bandwidth; // Average frame size target for clip
int min_frame_bandwidth; // Minimum allocation used for any frame int min_frame_bandwidth; // Minimum allocation used for any frame
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment