libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.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_VPX_ENCODER_H_
@@ skipping 62 matching lines @@
    */
 #define VPX_CODEC_CAP_PSNR  0x10000 /**< Can issue PSNR packets */
 
   /*! Can output one partition at a time. Each partition is returned in its
    *  own VPX_CODEC_CX_FRAME_PKT, with the FRAME_IS_FRAGMENT flag set for
    *  every partition but the last. In this mode all frames are always
    *  returned partition by partition.
    */
 #define VPX_CODEC_CAP_OUTPUT_PARTITION  0x20000
 
+/*! Can support input images at greater than 8 bitdepth.
+ */
+#define VPX_CODEC_CAP_HIGHBITDEPTH  0x40000
 
   /*! \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_USE_PSNR  0x10000 /**< Calculate PSNR on each frame */
 #define VPX_CODEC_USE_OUTPUT_PARTITION  0x20000 /**< Make the encoder output one
   partition at a time. */
+#define VPX_CODEC_USE_HIGHBITDEPTH 0x40000 /**< Use high bitdepth */
 
 
   /*!\brief Generic fixed size buffer structure
    *
    * This structure is able to hold a reference to any fixed size buffer.
    */
   typedef struct vpx_fixed_buf {
     void          *buf; /**< Pointer to the data */
     size_t         sz;  /**< Length of the buffer, in chars */
   } vpx_fixed_buf_t; /**< alias for struct vpx_fixed_buf */
@@ skipping 77 matching lines @@
                                                     (in timebase units) */
         vpx_codec_frame_flags_t  flags;    /**< flags for this frame */
         int                      partition_id; /**< the partition id
                                               defines the decoding order
                                               of the partitions. Only
                                               applicable when "output partition"
                                               mode is enabled. First partition
                                               has id 0.*/
 
       } frame;  /**< data for compressed frame packet */
-      struct vpx_fixed_buf twopass_stats;  /**< data for two-pass packet */
-      struct vpx_fixed_buf firstpass_mb_stats; /**< first pass mb packet */
+      vpx_fixed_buf_t twopass_stats;  /**< data for two-pass packet */
+      vpx_fixed_buf_t firstpass_mb_stats; /**< first pass mb packet */
       struct vpx_psnr_pkt {
         unsigned int samples[4];  /**< Number of samples, total/y/u/v */
         uint64_t     sse[4];      /**< sum squared error, total/y/u/v */
         double       psnr[4];     /**< PSNR, total/y/u/v */
       } psnr;                       /**< data for PSNR packet */
-      struct vpx_fixed_buf raw;     /**< data for arbitrary packets */
+      vpx_fixed_buf_t raw;     /**< data for arbitrary packets */
 #if CONFIG_SPATIAL_SVC
       size_t layer_sizes[VPX_SS_MAX_LAYERS];
 #endif
 
       /* This packet size is fixed to allow codecs to extend this
        * interface without having to manage storage for raw packets,
        * i.e., if it's smaller than 128 bytes, you can store in the
        * packet list directly.
        */
       char pad[128 - sizeof(enum vpx_codec_cx_pkt_kind)]; /**< fixed sz */
@@ skipping 108 matching lines @@
 
     /*!\brief Height of the frame
      *
      * This value identifies the presentation resolution of the frame,
      * in pixels. Note that the frames passed as input to the encoder must
      * have this resolution. Frames will be presented by the decoder in this
      * resolution, independent of any spatial resampling the encoder may do.
      */
     unsigned int           g_h;
 
+    /*!\brief Bit-depth of the codec
+     *
+     * This value identifies the bit_depth of the codec,
+     * Only certain bit-depths are supported as identified in the
+     * vpx_bit_depth_t enum.
+     */
+    vpx_bit_depth_t        g_bit_depth;
+
+    /*!\brief Bit-depth of the input frames
+     *
+     * This value identifies the bit_depth of the input frames in bits.
+     * Note that the frames passed as input to the encoder must have
+     * this bit-depth.
+     */
+    unsigned int           g_input_bit_depth;
 
     /*!\brief Stream timebase units
      *
      * Indicates the smallest interval of time, in seconds, used by the stream.
      * For fixed frame rate material, or variable frame rate material where
      * frames are timed at a multiple of a given clock (ex: video capture),
      * the \ref RECOMMENDED method is to set the timebase to the reciprocal
      * of the frame rate (ex: 1001/30000 for 29.970 Hz NTSC). This allows the
      * pts to correspond to the frame number, which can be handy. For
      * re-encoding video from containers with absolute time timestamps, the
@@ skipping 108 matching lines @@
      * bitrate are acceptable.
      */
     enum vpx_rc_mode       rc_end_usage;
 
 
     /*!\brief Two-pass stats buffer.
      *
      * A buffer containing all of the stats packets produced in the first
      * pass, concatenated.
      */
-    struct vpx_fixed_buf   rc_twopass_stats_in;
+    vpx_fixed_buf_t   rc_twopass_stats_in;
 
     /*!\brief first pass mb stats buffer.
      *
      * A buffer containing all of the first pass mb stats packets produced
      * in the first pass, concatenated.
      */
-    struct vpx_fixed_buf   rc_firstpass_mb_stats_in;
+    vpx_fixed_buf_t   rc_firstpass_mb_stats_in;
 
     /*!\brief Target data rate
      *
      * Target bandwidth to use for this stream, in kilobits per second.
      */
     unsigned int           rc_target_bitrate;
 
 
     /*
      * quantizer settings
@@ skipping 235 matching lines @@
    * \param[in]    flags   Bitfield of VPX_CODEC_USE_* flags
    * \param[in]    ver     ABI version number. Must be set to
    *                       VPX_ENCODER_ABI_VERSION
    * \retval #VPX_CODEC_OK
    *     The decoder algorithm initialized.
    * \retval #VPX_CODEC_MEM_ERROR
    *     Memory allocation failed.
    */
   vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t      *ctx,
                                          vpx_codec_iface_t    *iface,
-                                         vpx_codec_enc_cfg_t  *cfg,
+                                         const vpx_codec_enc_cfg_t *cfg,
                                          vpx_codec_flags_t     flags,
                                          int                   ver);
 
 
   /*!\brief Convenience macro for vpx_codec_enc_init_ver()
    *
    * Ensures the ABI version parameter is properly set.
    */
 #define vpx_codec_enc_init(ctx, iface, cfg, flags) \
   vpx_codec_enc_init_ver(ctx, iface, cfg, flags, VPX_ENCODER_ABI_VERSION)
@@ skipping 232 matching lines @@
    */
   const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t   *ctx);
 
 
   /*!@} - end defgroup encoder*/
 #ifdef __cplusplus
 }
 #endif
 #endif  // VPX_VPX_ENCODER_H_