libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_rdopt.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 829 matching lines @@
 static int vp9_sb_block_error_c(int16_t *coeff, int16_t *dqcoeff,
                                 int block_size) {
   int i;
   int64_t error = 0;
 
   for (i = 0; i < block_size; i++) {
     unsigned int this_diff = coeff[i] - dqcoeff[i];
     error += this_diff * this_diff;
   }
 
-  return error > INT_MAX ? INT_MAX : error;
+  return error > INT_MAX ? INT_MAX : (int)error;
 }
 
 #define DEBUG_ERROR 0
 static void super_block_yrd_32x32(MACROBLOCK *x,
                                   int *rate, int *distortion, int *skippable,
                                   int backup) {
   SUPERBLOCK  * const x_sb = &x->sb_coeff_data;
   MACROBLOCKD * const xd = &x->e_mbd;
   SUPERBLOCKD * const xd_sb = &xd->sb_coeff_data;
 #if DEBUG_ERROR || CONFIG_DWTDCTHYBRID
@@ skipping 2255 matching lines @@
   ctx->skip = x->skip;
   ctx->best_mode_index = mode_index;
   vpx_memcpy(&ctx->mic, xd->mode_info_context,
              sizeof(MODE_INFO));
   if (partition)
     vpx_memcpy(&ctx->partition_info, partition,
                sizeof(PARTITION_INFO));
   ctx->best_ref_mv.as_int = ref_mv->as_int;
   ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;
 
-  ctx->single_pred_diff = comp_pred_diff[SINGLE_PREDICTION_ONLY];
-  ctx->comp_pred_diff   = comp_pred_diff[COMP_PREDICTION_ONLY];
-  ctx->hybrid_pred_diff = comp_pred_diff[HYBRID_PREDICTION];
+  ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_PREDICTION_ONLY];
+  ctx->comp_pred_diff   = (int)comp_pred_diff[COMP_PREDICTION_ONLY];
+  ctx->hybrid_pred_diff = (int)comp_pred_diff[HYBRID_PREDICTION];
 
   memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff));
 }
 
 static void inter_mode_cost(VP9_COMP *cpi, MACROBLOCK *x,
                             int *rate2, int *distortion2, int *rate_y,
                             int *distortion, int* rate_uv, int *distortion_uv,
                             int *skippable, int64_t txfm_cache[NB_TXFM_MODES]) {
   int y_skippable, uv_skippable;
 
@@ skipping 1922 matching lines @@
   // to simplify development
   //    vp9_pick_inter_mode
 
   // Store metrics so they can be added in to totals if this mode is picked
   x->mb_context[xd->sb_index][xd->mb_index].distortion  = distortion;
   x->mb_context[xd->sb_index][xd->mb_index].intra_error = intra_error;
 
   *totalrate = rate;
   *totaldist = distortion;
 }