libvpx: Pull from upstream

source/libvpx/vp8/encoder/encodeframe.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 137 matching lines @@
         unsigned int i,j;
         unsigned int * sortlist;
         unsigned int tmp;
 
         /* Create a list to sort to */
         CHECK_MEM_ERROR(sortlist,
                         vpx_calloc(sizeof(unsigned int),
                         cpi->common.MBs));
 
         /* Copy map to sort list */
-        vpx_memcpy( sortlist, cpi->mb_activity_map,
-                    sizeof(unsigned int) * cpi->common.MBs );
+        memcpy( sortlist, cpi->mb_activity_map,
+                sizeof(unsigned int) * cpi->common.MBs );
 
 
         /* Ripple each value down to its correct position */
         for ( i = 1; i < cpi->common.MBs; i ++ )
         {
             for ( j = i; j > 0; j -- )
             {
                 if ( sortlist[j] < sortlist[j-1] )
                 {
                     /* Swap values */
@@ skipping 488 matching lines @@
 
     vp8_build_block_offsets(x);
 
     xd->mode_info_context->mbmi.mode = DC_PRED;
     xd->mode_info_context->mbmi.uv_mode = DC_PRED;
 
     xd->left_context = &cm->left_context;
 
     x->mvc = cm->fc.mvc;
 
-    vpx_memset(cm->above_context, 0,
-               sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
+    memset(cm->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
 
     /* Special case treatment when GF and ARF are not sensible options
      * for reference
      */
     if (cpi->ref_frame_flags == VP8_LAST_FRAME)
         vp8_calc_ref_frame_costs(x->ref_frame_cost,
                                  cpi->prob_intra_coded,255,128);
     else if ((cpi->oxcf.number_of_layers > 1) &&
                (cpi->ref_frame_flags == VP8_GOLD_FRAME))
         vp8_calc_ref_frame_costs(x->ref_frame_cost,
@@ skipping 57 matching lines @@
     VP8_COMMON *const cm = & cpi->common;
     MACROBLOCKD *const xd = & x->e_mbd;
     TOKENEXTRA *tp = cpi->tok;
     int segment_counts[MAX_MB_SEGMENTS];
     int totalrate;
 #if CONFIG_REALTIME_ONLY & CONFIG_ONTHEFLY_BITPACKING
     BOOL_CODER * bc = &cpi->bc[1]; /* bc[0] is for control partition */
     const int num_part = (1 << cm->multi_token_partition);
 #endif
 
-    vpx_memset(segment_counts, 0, sizeof(segment_counts));
+    memset(segment_counts, 0, sizeof(segment_counts));
     totalrate = 0;
 
     if (cpi->compressor_speed == 2)
     {
         if (cpi->oxcf.cpu_used < 0)
             cpi->Speed = -(cpi->oxcf.cpu_used);
         else
             vp8_auto_select_speed(cpi);
     }
 
@@ skipping 209 matching lines @@
 
 
     // Work out the segment probabilities if segmentation is enabled
     // and needs to be updated
     if (xd->segmentation_enabled && xd->update_mb_segmentation_map)
     {
         int tot_count;
         int i;
 
         /* Set to defaults */
-        vpx_memset(xd->mb_segment_tree_probs, 255 , sizeof(xd->mb_segment_tree_probs));
+        memset(xd->mb_segment_tree_probs, 255 , sizeof(xd->mb_segment_tree_probs));
 
         tot_count = segment_counts[0] + segment_counts[1] + segment_counts[2] + segment_counts[3];
 
         if (tot_count)
         {
             xd->mb_segment_tree_probs[0] = ((segment_counts[0] + segment_counts[1]) * 255) / tot_count;
 
             tot_count = segment_counts[0] + segment_counts[1];
 
             if (tot_count > 0)
@@ skipping 427 matching lines @@
             vp8_fix_contexts(xd);
         }
         else
         {
             vp8_stuff_mb(cpi, x, t);
         }
     }
 
     return rate;
 }