libvpx: Pull from upstream

source/libvpx/vp8/encoder/firstpass.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 922 matching lines @@
     intra_cost = bitcost(av_intra);
 
     /* Estimate of extra bits per mv overhead for mbs
      * << 9 is the normalization to the (bits * 512) used in vp8_bits_per_mb
      */
     mv_cost = ((int)(fpstats->new_mv_count / fpstats->count) * 8) << 9;
 
     /* Crude estimate of overhead cost from modes
      * << 9 is the normalization to (bits * 512) used in vp8_bits_per_mb
      */
-    mode_cost =((((av_pct_inter - av_pct_motion) * zz_cost) +
-                (av_pct_motion * motion_cost) +
-                (av_intra * intra_cost)) * cpi->common.MBs) * 512;
+    mode_cost = (int64_t)((((av_pct_inter - av_pct_motion) * zz_cost) +
+                             (av_pct_motion * motion_cost) +
+                             (av_intra * intra_cost)) * cpi->common.MBs) * 512;
 
     return mv_cost + mode_cost;
 }
 
 static double calc_correction_factor( double err_per_mb,
                                       double err_devisor,
                                       double pt_low,
                                       double pt_high,
                                       int Q )
 {
@@ skipping 1347 matching lines @@
             int boost = cpi->gfu_boost;
 #endif
             if ( boost >= 150 )
             {
                 int pct_extra;
 
                 pct_extra = (boost - 100) / 50;
                 pct_extra = (pct_extra > 20) ? 20 : pct_extra;
 
                 cpi->twopass.alt_extra_bits =
-                    (cpi->twopass.gf_group_bits * pct_extra) / 100;
+                    (int)(cpi->twopass.gf_group_bits * pct_extra) / 100;
                 cpi->twopass.gf_group_bits -= cpi->twopass.alt_extra_bits;
                 cpi->twopass.alt_extra_bits /=
                     ((cpi->baseline_gf_interval-1)>>1);
             }
             else
                 cpi->twopass.alt_extra_bits = 0;
         }
         else
             cpi->twopass.alt_extra_bits = 0;
     }
@@ skipping 55 matching lines @@
      * at the top end.
      */
     if (target_frame_size < 0)
         target_frame_size = 0;
     else
     {
         if (target_frame_size > max_bits)
             target_frame_size = max_bits;
 
         if (target_frame_size > cpi->twopass.gf_group_bits)
-            target_frame_size = cpi->twopass.gf_group_bits;
+            target_frame_size = (int)cpi->twopass.gf_group_bits;
     }
 
     /* Adjust error and bits remaining */
     cpi->twopass.gf_group_error_left -= (int)modified_err;
     cpi->twopass.gf_group_bits -= target_frame_size;
 
     if (cpi->twopass.gf_group_bits < 0)
         cpi->twopass.gf_group_bits = 0;
 
     /* Add in the minimum number of bits that is set aside for every frame. */
@@ skipping 958 matching lines @@
         }
 
         if ((cpi->common.Width != new_width) || (cpi->common.Height != new_height))
         {
             cpi->common.Width = new_width;
             cpi->common.Height = new_height;
             vp8_alloc_compressor_data(cpi);
         }
     }
 }