libvpx: Pull from upstream

source/libvpx/vp9/vp9_dx_iface.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 28 matching lines @@
   {VP9_SEG_MAX, 0, 0, 0, NULL}
 };
 
 struct vpx_codec_alg_priv {
   vpx_codec_priv_t        base;
   vpx_codec_mmap_t        mmaps[NELEMENTS(vp9_mem_req_segs) - 1];
   vpx_codec_dec_cfg_t     cfg;
   vp9_stream_info_t       si;
   int                     defer_alloc;
   int                     decoder_init;
-  VP9D_PTR                pbi;
+  struct VP9Decompressor *pbi;
   int                     postproc_cfg_set;
   vp8_postproc_cfg_t      postproc_cfg;
 #if CONFIG_POSTPROC_VISUALIZER
   unsigned int            dbg_postproc_flag;
   int                     dbg_color_ref_frame_flag;
   int                     dbg_color_mb_modes_flag;
   int                     dbg_color_b_modes_flag;
   int                     dbg_display_mv_flag;
 #endif
   vpx_image_t             img;
@@ skipping 92 matching lines @@
   si->w = si->h = 0;
 
   {
     struct vp9_read_bit_buffer rb = { data, data + data_sz, 0, NULL, NULL };
     const int frame_marker = vp9_rb_read_literal(&rb, 2);
     const int version = vp9_rb_read_bit(&rb);
     (void) vp9_rb_read_bit(&rb);  // unused version bit
 
     if (frame_marker != VP9_FRAME_MARKER)
       return VPX_CODEC_UNSUP_BITSTREAM;
-#if CONFIG_NON420
     if (version > 1) return VPX_CODEC_UNSUP_BITSTREAM;
-#else
-    if (version != 0) return VPX_CODEC_UNSUP_BITSTREAM;
-#endif
 
     if (vp9_rb_read_bit(&rb)) {  // show an existing frame
       return VPX_CODEC_OK;
     }
 
     si->is_kf = !vp9_rb_read_bit(&rb);
     if (si->is_kf) {
       const int sRGB = 7;
       int colorspace;
 
@@ skipping 94 matching lines @@
   }
 
   /* Initialize the decoder instance on the first frame*/
   if (!res && !ctx->decoder_init) {
     res = vpx_validate_mmaps(&ctx->si, ctx->mmaps,
                              vp9_mem_req_segs, NELEMENTS(vp9_mem_req_segs),
                              ctx->base.init_flags);
 
     if (!res) {
       VP9D_CONFIG oxcf;
-      VP9D_PTR optr;
+      struct VP9Decompressor *optr;
 
       vp9_initialize_dec();
 
       oxcf.width = ctx->si.w;
       oxcf.height = ctx->si.h;
       oxcf.version = 9;
       oxcf.postprocess = 0;
       oxcf.max_threads = ctx->cfg.threads;
       oxcf.inv_tile_order = ctx->invert_tile_order;
       optr = vp9_create_decompressor(&oxcf);
@@ skipping 163 matching lines @@
     assert(data_start <= data_end);
 
     /* Early exit if there was a decode error */
     if (res)
       break;
 
     /* Account for suboptimal termination by the encoder. */
     while (data_start < data_end && *data_start == 0)
       data_start++;
 
-    data_sz = data_end - data_start;
+    data_sz = (unsigned int)(data_end - data_start);
   } while (data_start < data_end);
   return res;
 }
 
 static vpx_image_t *vp9_get_frame(vpx_codec_alg_priv_t  *ctx,
                                   vpx_codec_iter_t      *iter) {
   vpx_image_t *img = NULL;
 
   if (ctx->img_avail) {
     /* iter acts as a flip flop, so an image is only returned on the first
@@ skipping 278 matching lines @@
   { // NOLINT
     /* encoder functions */
     NOT_IMPLEMENTED,
     NOT_IMPLEMENTED,
     NOT_IMPLEMENTED,
     NOT_IMPLEMENTED,
     NOT_IMPLEMENTED,
     NOT_IMPLEMENTED
   }
 };