libvpx: Pull from upstream

source/libvpx/vp8/encoder/bitstream.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 141 matching lines @@
     vp8_write_token(bc, vp8_bmode_tree, p, vp8_bmode_encodings + m);
 }
 
 static void write_split(vp8_writer *bc, int x)
 {
     vp8_write_token(
         bc, vp8_mbsplit_tree, vp8_mbsplit_probs, vp8_mbsplit_encodings + x
     );
 }
 
-void vp8_pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount)
+void vp8_pack_tokens(vp8_writer *w, const TOKENEXTRA *p, int xcount)
 {
     const TOKENEXTRA *stop = p + xcount;
     unsigned int split;
     unsigned int shift;
     int count = w->count;
     unsigned int range = w->range;
     unsigned int lowvalue = w->lowvalue;
 
     while (p < stop)
     {
@@ skipping 194 matching lines @@
 
     csize = size & 0xff;
     *cx_data = csize;
     csize = (size >> 8) & 0xff;
     *(cx_data + 1) = csize;
     csize = (size >> 16) & 0xff;
     *(cx_data + 2) = csize;
 
 }
 
-static void pack_tokens_into_partitions_c(VP8_COMP *cpi, unsigned char *cx_data,
+static void pack_tokens_into_partitions(VP8_COMP *cpi, unsigned char *cx_data,
                                           unsigned char * cx_data_end,
                                           int num_part)
 {
 
     int i;
     unsigned char *ptr = cx_data;
     unsigned char *ptr_end = cx_data_end;
     vp8_writer * w;
 
     for (i = 0; i < num_part; i++)
     {
         int mb_row;
 
         w = cpi->bc + i + 1;
 
         vp8_start_encode(w, ptr, ptr_end);
 
         for (mb_row = i; mb_row < cpi->common.mb_rows; mb_row += num_part)
         {
             const TOKENEXTRA *p    = cpi->tplist[mb_row].start;
             const TOKENEXTRA *stop = cpi->tplist[mb_row].stop;
             int tokens = (int)(stop - p);
 
-            vp8_pack_tokens_c(w, p, tokens);
+            vp8_pack_tokens(w, p, tokens);
         }
 
         vp8_stop_encode(w);
         ptr += w->pos;
     }
 }
 
 
-static void pack_mb_row_tokens_c(VP8_COMP *cpi, vp8_writer *w)
+static void pack_mb_row_tokens(VP8_COMP *cpi, vp8_writer *w)
 {
     int mb_row;
 
     for (mb_row = 0; mb_row < cpi->common.mb_rows; mb_row++)
     {
         const TOKENEXTRA *p    = cpi->tplist[mb_row].start;
         const TOKENEXTRA *stop = cpi->tplist[mb_row].stop;
         int tokens = (int)(stop - p);
 
-        vp8_pack_tokens_c(w, p, tokens);
+        vp8_pack_tokens(w, p, tokens);
     }
 
 }
 
 static void write_mv_ref
 (
     vp8_writer *w, MB_PREDICTION_MODE m, const vp8_prob *p
 )
 {
 #if CONFIG_DEBUG
@@ skipping 1238 matching lines @@
     {
         bc[1].error = &pc->error;
 
         vp8_start_encode(&cpi->bc[1], cx_data, cx_data_end);
 
 #if CONFIG_MULTITHREAD
         if (cpi->b_multi_threaded)
             pack_mb_row_tokens(cpi, &cpi->bc[1]);
         else
 #endif
-            pack_tokens(&cpi->bc[1], cpi->tok, cpi->tok_count);
+            vp8_pack_tokens(&cpi->bc[1], cpi->tok, cpi->tok_count);
 
         vp8_stop_encode(&cpi->bc[1]);
 
         *size += cpi->bc[1].pos;
         cpi->partition_sz[1] = cpi->bc[1].pos;
     }
 #endif
 }
 
 #ifdef VP8_ENTROPY_STATS
@@ skipping 38 matching lines @@
             fprintf(f, "    },\n");
         }
 
         fprintf(f, "  },\n");
     }
 
     fprintf(f, "};\n");
     fclose(f);
 }
 #endif