Merge remote branch 'internal/upstream-experimental' into HEAD

Conflicts:
	vp8/encoder/bitstream.c

Change-Id: I44c00f98dcb99eb728ce4f5256aefb135a711a74

diff --cc vp8/decoder/decodframe.c
index f69b09e210510e1a1322feecc63280f67f87c275,a300bb5fd84e59e700047248a6860170da31e359..4d02fdec49741e850947b850ab2afa371c4c69f7
--- 1/vp8/decoder/decodframe.c
--- 2/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -619,8 -650,9 +650,8 @@@ int vp8_decode_frame(VP8D_COMP *pbi
      VP8_COMMON *const pc = & pbi->common;
      MACROBLOCKD *const xd  = & pbi->mb;
      const unsigned char *data = (const unsigned char *)pbi->Source;
-     const unsigned char *const data_end = data + pbi->source_sz;
+     const unsigned char *data_end = data + pbi->source_sz;
      ptrdiff_t first_partition_length_in_bytes;
 -
      int mb_row;
      int i, j, k, l;
      const int *const mb_feature_data_bits = vp8_mb_feature_data_bits;

diff --cc vp8/decoder/onyxd_if.c
Simple merge

diff --cc vp8/decoder/onyxd_int.h
index ec1701079682f8e8f970f0b52a9b7a3cbc60e3ce,a8d1745dc3f286a3d2e76d019faf6ea4f126b8ea..591fa4f2314223a149c63f945cd44143c19ead6f
--- 1/vp8/decoder/onyxd_int.h
--- 2/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@@ -83,8 -83,10 +83,11 @@@ typedef struct VP8Decompresso
  
      const unsigned char *Source;
      unsigned int   source_sz;
+     const unsigned char *partitions[MAX_PARTITIONS];
+     unsigned int   partition_sizes[MAX_PARTITIONS];
+     unsigned int   num_partitions;
  
 +    unsigned char *segmentation_map;
  #if CONFIG_MULTITHREAD
      /* variable for threading */
  

diff --cc vp8/encoder/bitstream.c
index 4c4bb05bbbb9d51b770e8d2f083021d4dc8734e6,134e8488180426c863d97aa6edd476079f23d66f..e3c4b5f99fc4134f0b5c93e8b88fa59bfdc781ef
--- 1/vp8/encoder/bitstream.c
--- 2/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@@ -17,12 -17,13 +17,15 @@@
  #include "vp8/common/systemdependent.h"
  #include <assert.h>
  #include <stdio.h>
+ #include <limits.h>
  #include "vp8/common/pragmas.h"
+ #include "vpx/vpx_encoder.h"
  #include "vpx_mem/vpx_mem.h"
  #include "bitstream.h"
 -
+ #include "vp8/common/defaultcoefcounts.h"
 +#if CONFIG_SEGMENTATION
 +static int segment_cost = 0;
 +#endif
  const int vp8cx_base_skip_false_prob[128] =
  {
      255, 255, 255, 255, 255, 255, 255, 255,

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/onyx_int.h
Simple merge

diff --cc vp8/encoder/rdopt.c
Simple merge

diff --cc vp8/vp8_common.mk
Simple merge

diff --cc vpxenc.c
Simple merge