shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_ratectrl.h resolve visual studio warnings"

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -1453,8 +1453,8 @@

   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 &&

--- a/vp9/encoder/vp9_ratectrl.h

+++ b/vp9/encoder/vp9_ratectrl.h

@@ -34,17 +34,17 @@

   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