libvpx: Pull from upstream

source/libvpx/vpx/vpx_decoder.h

 /*
  *  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.
  */
 #ifndef VPX_DECODER_H
@@ skipping 12 matching lines @@
  *
  * This file describes the interface between an application and a
  * video decoder algorithm.
  *
  */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "vpx_codec.h"
+#include "vpx_external_frame_buffer.h"
 
   /*!\brief Current ABI version number
    *
    * \internal
    * If this file is altered in any way that changes the ABI, this value
    * must be bumped.  Examples include, but are not limited to, changing
    * types, removing or reassigning enums, adding/removing/rearranging
    * fields to structures
    */
-#define VPX_DECODER_ABI_VERSION (2 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
+#define VPX_DECODER_ABI_VERSION (3 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/
 
   /*! \brief Decoder capabilities bitfield
    *
    *  Each decoder advertises the capabilities it supports as part of its
    *  ::vpx_codec_iface_t interface structure. Capabilities are extra interfaces
    *  or functionality, and are not required to be supported by a decoder.
    *
    *  The available flags are specified by VPX_CODEC_CAP_* defines.
    */
 #define VPX_CODEC_CAP_PUT_SLICE  0x10000 /**< Will issue put_slice callbacks */
 #define VPX_CODEC_CAP_PUT_FRAME  0x20000 /**< Will issue put_frame callbacks */
 #define VPX_CODEC_CAP_POSTPROC   0x40000 /**< Can postprocess decoded frame */
 #define VPX_CODEC_CAP_ERROR_CONCEALMENT   0x80000 /**< Can conceal errors due to
   packet loss */
 #define VPX_CODEC_CAP_INPUT_FRAGMENTS   0x100000 /**< Can receive encoded frames
   one fragment at a time */
 
   /*! \brief Initialization-time Feature Enabling
    *
    *  Certain codec features must be known at initialization time, to allow for
    *  proper memory allocation.
    *
    *  The available flags are specified by VPX_CODEC_USE_* defines.
    */
 #define VPX_CODEC_CAP_FRAME_THREADING   0x200000 /**< Can support frame-based
                                                       multi-threading */
+#define VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x400000 /**< Can support external
+                                                      frame buffers */
 
 #define VPX_CODEC_USE_POSTPROC   0x10000 /**< Postprocess decoded frame */
 #define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 /**< Conceal errors in decoded
   frames */
 #define VPX_CODEC_USE_INPUT_FRAGMENTS   0x40000 /**< The input frame should be
   passed to the decoder one
   fragment at a time */
 #define VPX_CODEC_USE_FRAME_THREADING   0x80000 /**< Enable frame-based
                                                      multi-threading */
 
@@ skipping 240 matching lines @@
    *     Decoder context not initialized, or algorithm not capable of
    *     posting slice completion.
    */
   vpx_codec_err_t vpx_codec_register_put_slice_cb(vpx_codec_ctx_t             *ctx,
                                                   vpx_codec_put_slice_cb_fn_t  cb,
                                                   void                        *user_priv);
 
 
   /*!@} - end defgroup cap_put_slice*/
 
+  /*!\defgroup cap_external_frame_buffer External Frame Buffer Functions
+   *
+   * The following section is required to be implemented for all decoders
+   * that advertise the VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER capability.
+   * Calling this function for codecs that don't advertise this capability
+   * will result in an error code being returned, usually VPX_CODEC_ERROR.
+   *
+   * \note
+   * Currently this only works with VP9.
+   * @{
+   */
+
+  /*!\brief Pass in external frame buffers for the decoder to use.
+   *
+   * Registers a given function to be called when the current frame to
+   * decode will be bigger than the external frame buffer size. This
+   * function must be called before the first call to decode or libvpx
+   * will assume the default behavior of allocating frame buffers internally.
+   * Frame buffers with a size of 0 are valid.
+   *
+   * \param[in] ctx          Pointer to this instance's context
+   * \param[in] fb_list      Pointer to array of frame buffers
+   * \param[in] fb_count     Number of elements in frame buffer array
+   * \param[in] cb           Pointer to the callback function
+   * \param[in] user_priv    User's private data
+   *
+   * \retval #VPX_CODEC_OK
+   *     External frame buffers passed into the decoder.
+   * \retval #VPX_CODEC_ERROR
+   *     Decoder context not initialized, or algorithm not capable of
+   *     using external frame buffers.
+   *
+   * \note
+   * When decoding VP9, the application must pass in at least 8 external
+   * frame buffers, as VP9 can have up to 8 reference frames.
+   */
+  vpx_codec_err_t vpx_codec_set_frame_buffers(
+      vpx_codec_ctx_t *ctx,
+      vpx_codec_frame_buffer_t *fb_list, int fb_count,
+      vpx_realloc_frame_buffer_cb_fn_t cb, void *user_priv);
+
+  /*!@} - end defgroup cap_external_frame_buffer */
+
   /*!@} - end defgroup decoder*/
 #ifdef __cplusplus
 }
 #endif
 #endif