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

Conflicts:
	vp8/decoder/detokenize.c
	vp8/decoder/onyxd_if.c
	vp8/vp8_common.mk

Change-Id: Ifca1108186a8bc715da86a44021ee2fa5550b5b8

diff --cc configure
Simple merge

diff --cc vp8/common/onyxc_int.h
Simple merge

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

diff --cc vp8/decoder/onyxd_if.c
index 7c84b6e,2246194..71f3232
--- 1/vp8/decoder/onyxd_if.c
--- 2/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@@ -328,26 -288,10 +328,26 @@@ static int swap_frame_buffers (VP8_COMM
      return err;
  }
  
- int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, INT64 time_stamp)
 +/*
 +static void vp8_print_yuv_rec_mb(VP8_COMMON *cm, int mb_row, int mb_col)
 +{
 +  YV12_BUFFER_CONFIG *s = cm->frame_to_show;
 +  unsigned char *src = s->y_buffer;
 +  int i, j;
 +
 +  printf("After loop filter\n");
 +  for (i=0;i<16;i++) {
 +    for (j=0;j<16;j++)
 +      printf("%3d ", src[(mb_row*16+i)*s->y_stride + mb_col*16+j]);
 +    printf("\n");
 +  }
 +}
 +*/
 +
+ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsigned char *source, int64_t time_stamp)
  {
  #if HAVE_ARMV7
-     INT64 dx_store_reg[8];
+     int64_t dx_store_reg[8];
  #endif
      VP8D_COMP *pbi = (VP8D_COMP *) ptr;
      VP8_COMMON *cm = &pbi->common;

diff --cc vp8/decoder/onyxd_int.h
Simple merge

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

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
index 91e1e6c,053ecae..1a883b8
--- 1/vp8/vp8_common.mk
--- 2/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@@ -101,14 -102,7 +102,12 @@@ VP8_COMMON_SRCS-$(HAVE_SSE2) += common/
  endif
  
  # common (c)
- VP8_COMMON_SRCS-$(ARCH_ARM)  += common/asm_com_offsets.c
 +ifeq ($(CONFIG_CSM),yes)
 +VP8_COMMON_SRCS-yes += common/maskingmv.c
 +VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/mask_sse3.asm
 +endif
 +
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/arm_systemdependent.c
- 
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/bilinearfilter_arm.c
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/bilinearfilter_arm.h
  VP8_COMMON_SRCS-$(ARCH_ARM)  += common/arm/filter_arm.c

diff --cc vpxenc.c
Simple merge