summaryrefslogtreecommitdiff
path: root/vpx
diff options
context:
space:
mode:
authorChris Cunningham <chcunningham@chromium.org>2017-02-16 15:02:30 -0800
committerJames Zern <jzern@google.com>2017-02-28 17:10:34 -0800
commitbcd0c49af38037db29fdaa6ab30e3ed64d3b4b2f (patch)
treee0d23bbe028c393991003c9fa11a0db655dca3bd /vpx
parent3833905ff2ee6ba57fdd8f1e03a94adf85070db2 (diff)
downloadlibvpx-bcd0c49af38037db29fdaa6ab30e3ed64d3b4b2f.tar
libvpx-bcd0c49af38037db29fdaa6ab30e3ed64d3b4b2f.tar.gz
libvpx-bcd0c49af38037db29fdaa6ab30e3ed64d3b4b2f.tar.bz2
libvpx-bcd0c49af38037db29fdaa6ab30e3ed64d3b4b2f.zip
VPX_CODEC_CAP_HIGHBITDEPTH for decoder interface
Moves the def from vpx_encoder.h -> vpx_codec.h. The defined value is changed as part of this move. Adds the value to decoder capabilities when CONFIG_VP9_HIGHBITDEPTH. Change-Id: I7d61fc821cda29f1e32bb9b2b9ffd3d83966e419
Diffstat (limited to 'vpx')
-rw-r--r--vpx/vpx_codec.h6
-rw-r--r--vpx/vpx_encoder.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h
index fe75d2387..69f3c155b 100644
--- a/vpx/vpx_codec.h
+++ b/vpx/vpx_codec.h
@@ -83,7 +83,7 @@ extern "C" {
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
-#define VPX_CODEC_ABI_VERSION (3 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
+#define VPX_CODEC_ABI_VERSION (4 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/
/*!\brief Algorithm return codes */
typedef enum {
@@ -152,6 +152,10 @@ typedef long vpx_codec_caps_t;
#define VPX_CODEC_CAP_DECODER 0x1 /**< Is a decoder */
#define VPX_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */
+/*! Can support images at greater than 8 bitdepth.
+ */
+#define VPX_CODEC_CAP_HIGHBITDEPTH 0x4
+
/*! \brief Initialization-time Feature Enabling
*
* Certain codec features must be known at initialization time, to allow for
diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h
index 28fcd5f99..c915ed671 100644
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -83,10 +83,6 @@ extern "C" {
*/
#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