Commit ff00fc0f authored by Adrian Grange's avatar Adrian Grange

Change "VPX" to "AOM"

Change-Id: I6593a44de3b571193c2a4c8787ddf3b2fc24a268
parent 01dee0bb
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
- Upgrading: - Upgrading:
This release is ABI incompatible with 1.3.0. It drops the compatibility This release is ABI incompatible with 1.3.0. It drops the compatibility
layer, requiring VPX_IMG_FMT_* instead of IMG_FMT_*, and adds several codec layer, requiring AOM_IMG_FMT_* instead of IMG_FMT_*, and adds several codec
controls for VP9. controls for VP9.
- Enhancements: - Enhancements:
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
aomdec: test for frame corruption aomdec: test for frame corruption
aomenc: add quantizer histogram display aomenc: add quantizer histogram display
aomenc: add rate histogram display aomenc: add rate histogram display
Set VPX_FRAME_IS_DROPPABLE Set AOM_FRAME_IS_DROPPABLE
update configure for ios sdk 4.3 update configure for ios sdk 4.3
Avoid text relocations in ARM vp8 decoder Avoid text relocations in ARM vp8 decoder
Generate a aom.pc file for pkg-config. Generate a aom.pc file for pkg-config.
......
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
* Once initialized, the instance is manged using other functions from * Once initialized, the instance is manged using other functions from
* the aom_codec_* family. * the aom_codec_* family.
*/ */
#ifndef VPX_VPX_CODEC_H_ #ifndef AOM_AOM_CODEC_H_
#define VPX_VPX_CODEC_H_ #define AOM_AOM_CODEC_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -84,31 +84,31 @@ extern "C" { ...@@ -84,31 +84,31 @@ extern "C" {
* types, removing or reassigning enums, adding/removing/rearranging * types, removing or reassigning enums, adding/removing/rearranging
* fields to structures * fields to structures
*/ */
#define VPX_CODEC_ABI_VERSION (3 + VPX_IMAGE_ABI_VERSION) /**<\hideinitializer*/ #define AOM_CODEC_ABI_VERSION (3 + AOM_IMAGE_ABI_VERSION) /**<\hideinitializer*/
/*!\brief Algorithm return codes */ /*!\brief Algorithm return codes */
typedef enum { typedef enum {
/*!\brief Operation completed without error */ /*!\brief Operation completed without error */
VPX_CODEC_OK, AOM_CODEC_OK,
/*!\brief Unspecified error */ /*!\brief Unspecified error */
VPX_CODEC_ERROR, AOM_CODEC_ERROR,
/*!\brief Memory operation failed */ /*!\brief Memory operation failed */
VPX_CODEC_MEM_ERROR, AOM_CODEC_MEM_ERROR,
/*!\brief ABI version mismatch */ /*!\brief ABI version mismatch */
VPX_CODEC_ABI_MISMATCH, AOM_CODEC_ABI_MISMATCH,
/*!\brief Algorithm does not have required capability */ /*!\brief Algorithm does not have required capability */
VPX_CODEC_INCAPABLE, AOM_CODEC_INCAPABLE,
/*!\brief The given bitstream is not supported. /*!\brief The given bitstream is not supported.
* *
* The bitstream was unable to be parsed at the highest level. The decoder * The bitstream was unable to be parsed at the highest level. The decoder
* is unable to proceed. This error \ref SHOULD be treated as fatal to the * is unable to proceed. This error \ref SHOULD be treated as fatal to the
* stream. */ * stream. */
VPX_CODEC_UNSUP_BITSTREAM, AOM_CODEC_UNSUP_BITSTREAM,
/*!\brief Encoded bitstream uses an unsupported feature /*!\brief Encoded bitstream uses an unsupported feature
* *
...@@ -117,7 +117,7 @@ typedef enum { ...@@ -117,7 +117,7 @@ typedef enum {
* pictures from being properly decoded. This error \ref MAY be treated as * pictures from being properly decoded. This error \ref MAY be treated as
* fatal to the stream or \ref MAY be treated as fatal to the current GOP. * fatal to the stream or \ref MAY be treated as fatal to the current GOP.
*/ */
VPX_CODEC_UNSUP_FEATURE, AOM_CODEC_UNSUP_FEATURE,
/*!\brief The coded data for this stream is corrupt or incomplete /*!\brief The coded data for this stream is corrupt or incomplete
* *
...@@ -127,17 +127,17 @@ typedef enum { ...@@ -127,17 +127,17 @@ typedef enum {
* stream or \ref MAY be treated as fatal to the current GOP. If decoding * stream or \ref MAY be treated as fatal to the current GOP. If decoding
* is continued for the current GOP, artifacts may be present. * is continued for the current GOP, artifacts may be present.
*/ */
VPX_CODEC_CORRUPT_FRAME, AOM_CODEC_CORRUPT_FRAME,
/*!\brief An application-supplied parameter is not valid. /*!\brief An application-supplied parameter is not valid.
* *
*/ */
VPX_CODEC_INVALID_PARAM, AOM_CODEC_INVALID_PARAM,
/*!\brief An iterator reached the end of list. /*!\brief An iterator reached the end of list.
* *
*/ */
VPX_CODEC_LIST_END AOM_CODEC_LIST_END
} aom_codec_err_t; } aom_codec_err_t;
...@@ -147,18 +147,18 @@ typedef enum { ...@@ -147,18 +147,18 @@ typedef enum {
* ::aom_codec_iface_t interface structure. Capabilities are extra interfaces * ::aom_codec_iface_t interface structure. Capabilities are extra interfaces
* or functionality, and are not required to be supported. * or functionality, and are not required to be supported.
* *
* The available flags are specified by VPX_CODEC_CAP_* defines. * The available flags are specified by AOM_CODEC_CAP_* defines.
*/ */
typedef long aom_codec_caps_t; typedef long aom_codec_caps_t;
#define VPX_CODEC_CAP_DECODER 0x1 /**< Is a decoder */ #define AOM_CODEC_CAP_DECODER 0x1 /**< Is a decoder */
#define VPX_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */ #define AOM_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */
/*! \brief Initialization-time Feature Enabling /*! \brief Initialization-time Feature Enabling
* *
* Certain codec features must be known at initialization time, to allow for * Certain codec features must be known at initialization time, to allow for
* proper memory allocation. * proper memory allocation.
* *
* The available flags are specified by VPX_CODEC_USE_* defines. * The available flags are specified by AOM_CODEC_USE_* defines.
*/ */
typedef long aom_codec_flags_t; typedef long aom_codec_flags_t;
...@@ -211,9 +211,9 @@ typedef struct aom_codec_ctx { ...@@ -211,9 +211,9 @@ typedef struct aom_codec_ctx {
* This enumeration determines the bit depth of the codec. * This enumeration determines the bit depth of the codec.
*/ */
typedef enum aom_bit_depth { typedef enum aom_bit_depth {
VPX_BITS_8 = 8, /**< 8 bits */ AOM_BITS_8 = 8, /**< 8 bits */
VPX_BITS_10 = 10, /**< 10 bits */ AOM_BITS_10 = 10, /**< 10 bits */
VPX_BITS_12 = 12, /**< 12 bits */ AOM_BITS_12 = 12, /**< 12 bits */
} aom_bit_depth_t; } aom_bit_depth_t;
/* /*
...@@ -236,11 +236,11 @@ typedef enum aom_bit_depth { ...@@ -236,11 +236,11 @@ typedef enum aom_bit_depth {
* *
*/ */
int aom_codec_version(void); int aom_codec_version(void);
#define VPX_VERSION_MAJOR(v) \ #define AOM_VERSION_MAJOR(v) \
((v >> 16) & 0xff) /**< extract major from packed version */ ((v >> 16) & 0xff) /**< extract major from packed version */
#define VPX_VERSION_MINOR(v) \ #define AOM_VERSION_MINOR(v) \
((v >> 8) & 0xff) /**< extract minor from packed version */ ((v >> 8) & 0xff) /**< extract minor from packed version */
#define VPX_VERSION_PATCH(v) \ #define AOM_VERSION_PATCH(v) \
((v >> 0) & 0xff) /**< extract patch from packed version */ ((v >> 0) & 0xff) /**< extract patch from packed version */
/*!\brief Return the version major number */ /*!\brief Return the version major number */
...@@ -337,9 +337,9 @@ const char *aom_codec_error_detail(aom_codec_ctx_t *ctx); ...@@ -337,9 +337,9 @@ const char *aom_codec_error_detail(aom_codec_ctx_t *ctx);
* *
* \param[in] ctx Pointer to this instance's context * \param[in] ctx Pointer to this instance's context
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* The codec algorithm initialized. * The codec algorithm initialized.
* \retval #VPX_CODEC_MEM_ERROR * \retval #AOM_CODEC_MEM_ERROR
* Memory allocation failed. * Memory allocation failed.
*/ */
aom_codec_err_t aom_codec_destroy(aom_codec_ctx_t *ctx); aom_codec_err_t aom_codec_destroy(aom_codec_ctx_t *ctx);
...@@ -361,7 +361,7 @@ aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface); ...@@ -361,7 +361,7 @@ aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface);
* *
* This wrapper function dispatches the request to the helper function * This wrapper function dispatches the request to the helper function
* associated with the given ctrl_id. It tries to call this function * associated with the given ctrl_id. It tries to call this function
* transparently, but will return #VPX_CODEC_ERROR if the request could not * transparently, but will return #AOM_CODEC_ERROR if the request could not
* be dispatched. * be dispatched.
* *
* Note that this function should not be used directly. Call the * Note that this function should not be used directly. Call the
...@@ -370,19 +370,19 @@ aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface); ...@@ -370,19 +370,19 @@ aom_codec_caps_t aom_codec_get_caps(aom_codec_iface_t *iface);
* \param[in] ctx Pointer to this instance's context * \param[in] ctx Pointer to this instance's context
* \param[in] ctrl_id Algorithm specific control identifier * \param[in] ctrl_id Algorithm specific control identifier
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* The control request was processed. * The control request was processed.
* \retval #VPX_CODEC_ERROR * \retval #AOM_CODEC_ERROR
* The control request was not processed. * The control request was not processed.
* \retval #VPX_CODEC_INVALID_PARAM * \retval #AOM_CODEC_INVALID_PARAM
* The data was not valid. * The data was not valid.
*/ */
aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
#if defined(VPX_DISABLE_CTRL_TYPECHECKS) && VPX_DISABLE_CTRL_TYPECHECKS #if defined(AOM_DISABLE_CTRL_TYPECHECKS) && AOM_DISABLE_CTRL_TYPECHECKS
#define aom_codec_control(ctx, id, data) aom_codec_control_(ctx, id, data) #define aom_codec_control(ctx, id, data) aom_codec_control_(ctx, id, data)
#define VPX_CTRL_USE_TYPE(id, typ) #define AOM_CTRL_USE_TYPE(id, typ)
#define VPX_CTRL_USE_TYPE_DEPRECATED(id, typ) #define AOM_CTRL_USE_TYPE_DEPRECATED(id, typ)
#define VPX_CTRL_VOID(id, typ) #define AOM_CTRL_VOID(id, typ)
#else #else
/*!\brief aom_codec_control wrapper macro /*!\brief aom_codec_control wrapper macro
...@@ -408,7 +408,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); ...@@ -408,7 +408,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
* the correctly typed arguments as a wrapper to the type-unsafe internal * the correctly typed arguments as a wrapper to the type-unsafe internal
* function. * function.
*/ */
#define VPX_CTRL_USE_TYPE(id, typ) \ #define AOM_CTRL_USE_TYPE(id, typ) \
static aom_codec_err_t aom_codec_control_##id(aom_codec_ctx_t *, int, typ) \ static aom_codec_err_t aom_codec_control_##id(aom_codec_ctx_t *, int, typ) \
UNUSED; \ UNUSED; \
\ \
...@@ -419,7 +419,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); ...@@ -419,7 +419,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
/*!\brief aom_codec_control deprecated type definition macro /*!\brief aom_codec_control deprecated type definition macro
* *
* Like #VPX_CTRL_USE_TYPE, but indicates that the specified control is * Like #AOM_CTRL_USE_TYPE, but indicates that the specified control is
* deprecated and should not be used. Consult the documentation for your * deprecated and should not be used. Consult the documentation for your
* codec for more information. * codec for more information.
* *
...@@ -427,7 +427,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); ...@@ -427,7 +427,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
* It defines a static function with the correctly typed arguments as a * It defines a static function with the correctly typed arguments as a
* wrapper to the type-unsafe internal function. * wrapper to the type-unsafe internal function.
*/ */
#define VPX_CTRL_USE_TYPE_DEPRECATED(id, typ) \ #define AOM_CTRL_USE_TYPE_DEPRECATED(id, typ) \
DECLSPEC_DEPRECATED static aom_codec_err_t aom_codec_control_##id( \ DECLSPEC_DEPRECATED static aom_codec_err_t aom_codec_control_##id( \
aom_codec_ctx_t *, int, typ) DEPRECATED UNUSED; \ aom_codec_ctx_t *, int, typ) DEPRECATED UNUSED; \
\ \
...@@ -446,7 +446,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); ...@@ -446,7 +446,7 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
* It defines a static function without a data argument as a wrapper to the * It defines a static function without a data argument as a wrapper to the
* type-unsafe internal function. * type-unsafe internal function.
*/ */
#define VPX_CTRL_VOID(id) \ #define AOM_CTRL_VOID(id) \
static aom_codec_err_t aom_codec_control_##id(aom_codec_ctx_t *, int) \ static aom_codec_err_t aom_codec_control_##id(aom_codec_ctx_t *, int) \
UNUSED; \ UNUSED; \
\ \
...@@ -461,4 +461,4 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...); ...@@ -461,4 +461,4 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // VPX_VPX_CODEC_H_ #endif // AOM_AOM_CODEC_H_
This diff is collapsed.
This diff is collapsed.
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#ifndef VPX_VPX_FRAME_BUFFER_H_ #ifndef AOM_AOM_FRAME_BUFFER_H_
#define VPX_VPX_FRAME_BUFFER_H_ #define AOM_AOM_FRAME_BUFFER_H_
/*!\file /*!\file
* \brief Describes the decoder external frame buffer interface. * \brief Describes the decoder external frame buffer interface.
...@@ -27,11 +27,11 @@ extern "C" { ...@@ -27,11 +27,11 @@ extern "C" {
* Each thread will use one work buffer. * Each thread will use one work buffer.
* TODO(hkuang): Add support to set number of worker threads dynamically. * TODO(hkuang): Add support to set number of worker threads dynamically.
*/ */
#define VPX_MAXIMUM_WORK_BUFFERS 8 #define AOM_MAXIMUM_WORK_BUFFERS 8
/*!\brief The maximum number of reference buffers that a VP9 encoder may use. /*!\brief The maximum number of reference buffers that a VP9 encoder may use.
*/ */
#define VPX_MAXIMUM_REF_BUFFERS 8 #define AOM_MAXIMUM_REF_BUFFERS 8
/*!\brief External frame buffer /*!\brief External frame buffer
* *
...@@ -81,4 +81,4 @@ typedef int (*aom_release_frame_buffer_cb_fn_t)(void *priv, ...@@ -81,4 +81,4 @@ typedef int (*aom_release_frame_buffer_cb_fn_t)(void *priv,
} // extern "C" } // extern "C"
#endif #endif
#endif // VPX_VPX_FRAME_BUFFER_H_ #endif // AOM_AOM_FRAME_BUFFER_H_
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* \brief Describes the aom image descriptor and associated operations * \brief Describes the aom image descriptor and associated operations
* *
*/ */
#ifndef VPX_VPX_IMAGE_H_ #ifndef AOM_AOM_IMAGE_H_
#define VPX_VPX_IMAGE_H_ #define AOM_AOM_IMAGE_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -28,61 +28,61 @@ extern "C" { ...@@ -28,61 +28,61 @@ extern "C" {
* types, removing or reassigning enums, adding/removing/rearranging * types, removing or reassigning enums, adding/removing/rearranging
* fields to structures * fields to structures
*/ */
#define VPX_IMAGE_ABI_VERSION (4) /**<\hideinitializer*/ #define AOM_IMAGE_ABI_VERSION (4) /**<\hideinitializer*/
#define VPX_IMG_FMT_PLANAR 0x100 /**< Image is a planar format. */ #define AOM_IMG_FMT_PLANAR 0x100 /**< Image is a planar format. */
#define VPX_IMG_FMT_UV_FLIP 0x200 /**< V plane precedes U in memory. */ #define AOM_IMG_FMT_UV_FLIP 0x200 /**< V plane precedes U in memory. */
#define VPX_IMG_FMT_HAS_ALPHA 0x400 /**< Image has an alpha channel. */ #define AOM_IMG_FMT_HAS_ALPHA 0x400 /**< Image has an alpha channel. */
#define VPX_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */ #define AOM_IMG_FMT_HIGHBITDEPTH 0x800 /**< Image uses 16bit framebuffer. */
/*!\brief List of supported image formats */ /*!\brief List of supported image formats */
typedef enum aom_img_fmt { typedef enum aom_img_fmt {
VPX_IMG_FMT_NONE, AOM_IMG_FMT_NONE,
VPX_IMG_FMT_RGB24, /**< 24 bit per pixel packed RGB */ AOM_IMG_FMT_RGB24, /**< 24 bit per pixel packed RGB */
VPX_IMG_FMT_RGB32, /**< 32 bit per pixel packed 0RGB */ AOM_IMG_FMT_RGB32, /**< 32 bit per pixel packed 0RGB */
VPX_IMG_FMT_RGB565, /**< 16 bit per pixel, 565 */ AOM_IMG_FMT_RGB565, /**< 16 bit per pixel, 565 */
VPX_IMG_FMT_RGB555, /**< 16 bit per pixel, 555 */ AOM_IMG_FMT_RGB555, /**< 16 bit per pixel, 555 */
VPX_IMG_FMT_UYVY, /**< UYVY packed YUV */ AOM_IMG_FMT_UYVY, /**< UYVY packed YUV */
VPX_IMG_FMT_YUY2, /**< YUYV packed YUV */ AOM_IMG_FMT_YUY2, /**< YUYV packed YUV */
VPX_IMG_FMT_YVYU, /**< YVYU packed YUV */ AOM_IMG_FMT_YVYU, /**< YVYU packed YUV */
VPX_IMG_FMT_BGR24, /**< 24 bit per pixel packed BGR */ AOM_IMG_FMT_BGR24, /**< 24 bit per pixel packed BGR */
VPX_IMG_FMT_RGB32_LE, /**< 32 bit packed BGR0 */ AOM_IMG_FMT_RGB32_LE, /**< 32 bit packed BGR0 */
VPX_IMG_FMT_ARGB, /**< 32 bit packed ARGB, alpha=255 */ AOM_IMG_FMT_ARGB, /**< 32 bit packed ARGB, alpha=255 */
VPX_IMG_FMT_ARGB_LE, /**< 32 bit packed BGRA, alpha=255 */ AOM_IMG_FMT_ARGB_LE, /**< 32 bit packed BGRA, alpha=255 */
VPX_IMG_FMT_RGB565_LE, /**< 16 bit per pixel, gggbbbbb rrrrrggg */ AOM_IMG_FMT_RGB565_LE, /**< 16 bit per pixel, gggbbbbb rrrrrggg */
VPX_IMG_FMT_RGB555_LE, /**< 16 bit per pixel, gggbbbbb 0rrrrrgg */ AOM_IMG_FMT_RGB555_LE, /**< 16 bit per pixel, gggbbbbb 0rrrrrgg */
VPX_IMG_FMT_YV12 = AOM_IMG_FMT_YV12 =
VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_UV_FLIP | 1, /**< planar YVU */ AOM_IMG_FMT_PLANAR | AOM_IMG_FMT_UV_FLIP | 1, /**< planar YVU */
VPX_IMG_FMT_I420 = VPX_IMG_FMT_PLANAR | 2, AOM_IMG_FMT_I420 = AOM_IMG_FMT_PLANAR | 2,
VPX_IMG_FMT_VPXYV12 = VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_UV_FLIP | AOM_IMG_FMT_AOMYV12 = AOM_IMG_FMT_PLANAR | AOM_IMG_FMT_UV_FLIP |
3, /** < planar 4:2:0 format with aom color space */ 3, /** < planar 4:2:0 format with aom color space */
VPX_IMG_FMT_VPXI420 = VPX_IMG_FMT_PLANAR | 4, AOM_IMG_FMT_AOMI420 = AOM_IMG_FMT_PLANAR | 4,
VPX_IMG_FMT_I422 = VPX_IMG_FMT_PLANAR | 5, AOM_IMG_FMT_I422 = AOM_IMG_FMT_PLANAR | 5,
VPX_IMG_FMT_I444 = VPX_IMG_FMT_PLANAR | 6, AOM_IMG_FMT_I444 = AOM_IMG_FMT_PLANAR | 6,
VPX_IMG_FMT_I440 = VPX_IMG_FMT_PLANAR | 7, AOM_IMG_FMT_I440 = AOM_IMG_FMT_PLANAR | 7,
VPX_IMG_FMT_444A = VPX_IMG_FMT_PLANAR | VPX_IMG_FMT_HAS_ALPHA | 6, AOM_IMG_FMT_444A = AOM_IMG_FMT_PLANAR | AOM_IMG_FMT_HAS_ALPHA | 6,
VPX_IMG_FMT_I42016 = VPX_IMG_FMT_I420 | VPX_IMG_FMT_HIGHBITDEPTH, AOM_IMG_FMT_I42016 = AOM_IMG_FMT_I420 | AOM_IMG_FMT_HIGHBITDEPTH,
VPX_IMG_FMT_I42216 = VPX_IMG_FMT_I422 | VPX_IMG_FMT_HIGHBITDEPTH, AOM_IMG_FMT_I42216 = AOM_IMG_FMT_I422 | AOM_IMG_FMT_HIGHBITDEPTH,
VPX_IMG_FMT_I44416 = VPX_IMG_FMT_I444 | VPX_IMG_FMT_HIGHBITDEPTH, AOM_IMG_FMT_I44416 = AOM_IMG_FMT_I444 | AOM_IMG_FMT_HIGHBITDEPTH,
VPX_IMG_FMT_I44016 = VPX_IMG_FMT_I440 | VPX_IMG_FMT_HIGHBITDEPTH AOM_IMG_FMT_I44016 = AOM_IMG_FMT_I440 | AOM_IMG_FMT_HIGHBITDEPTH
} aom_img_fmt_t; /**< alias for enum aom_img_fmt */ } aom_img_fmt_t; /**< alias for enum aom_img_fmt */
/*!\brief List of supported color spaces */ /*!\brief List of supported color spaces */
typedef enum aom_color_space { typedef enum aom_color_space {
VPX_CS_UNKNOWN = 0, /**< Unknown */ AOM_CS_UNKNOWN = 0, /**< Unknown */
VPX_CS_BT_601 = 1, /**< BT.601 */ AOM_CS_BT_601 = 1, /**< BT.601 */
VPX_CS_BT_709 = 2, /**< BT.709 */ AOM_CS_BT_709 = 2, /**< BT.709 */
VPX_CS_SMPTE_170 = 3, /**< SMPTE.170 */ AOM_CS_SMPTE_170 = 3, /**< SMPTE.170 */
VPX_CS_SMPTE_240 = 4, /**< SMPTE.240 */ AOM_CS_SMPTE_240 = 4, /**< SMPTE.240 */
VPX_CS_BT_2020 = 5, /**< BT.2020 */ AOM_CS_BT_2020 = 5, /**< BT.2020 */
VPX_CS_RESERVED = 6, /**< Reserved */ AOM_CS_RESERVED = 6, /**< Reserved */
VPX_CS_SRGB = 7 /**< sRGB */ AOM_CS_SRGB = 7 /**< sRGB */
} aom_color_space_t; /**< alias for enum aom_color_space */ } aom_color_space_t; /**< alias for enum aom_color_space */
/*!\brief List of supported color range */ /*!\brief List of supported color range */
typedef enum aom_color_range { typedef enum aom_color_range {
VPX_CR_STUDIO_RANGE = 0, /**< Y [16..235], UV [16..240] */ AOM_CR_STUDIO_RANGE = 0, /**< Y [16..235], UV [16..240] */
VPX_CR_FULL_RANGE = 1 /**< YUV/RGB [0..255] */ AOM_CR_FULL_RANGE = 1 /**< YUV/RGB [0..255] */
} aom_color_range_t; /**< alias for enum aom_color_range */ } aom_color_range_t; /**< alias for enum aom_color_range */
/**\brief Image Descriptor */ /**\brief Image Descriptor */
...@@ -109,11 +109,11 @@ typedef struct aom_image { ...@@ -109,11 +109,11 @@ typedef struct aom_image {
unsigned int y_chroma_shift; /**< subsampling order, Y */ unsigned int y_chroma_shift; /**< subsampling order, Y */
/* Image data pointers. */ /* Image data pointers. */
#define VPX_PLANE_PACKED 0 /**< To be used for all packed formats */ #define AOM_PLANE_PACKED 0 /**< To be used for all packed formats */
#define VPX_PLANE_Y 0 /**< Y (Luminance) plane */ #define AOM_PLANE_Y 0 /**< Y (Luminance) plane */
#define VPX_PLANE_U 1 /**< U (Chroma) plane */ #define AOM_PLANE_U 1 /**< U (Chroma) plane */
#define VPX_PLANE_V 2 /**< V (Chroma) plane */ #define AOM_PLANE_V 2 /**< V (Chroma) plane */
#define VPX_PLANE_ALPHA 3 /**< A (Transparency) plane */ #define AOM_PLANE_ALPHA 3 /**< A (Transparency) plane */
unsigned char *planes[4]; /**< pointer to the top left pixel for each plane */ unsigned char *planes[4]; /**< pointer to the top left pixel for each plane */
int stride[4]; /**< stride between rows for each plane */ int stride[4]; /**< stride between rows for each plane */
...@@ -223,4 +223,4 @@ void aom_img_free(aom_image_t *img); ...@@ -223,4 +223,4 @@ void aom_img_free(aom_image_t *img);
} // extern "C" } // extern "C"
#endif #endif
#endif // VPX_VPX_IMAGE_H_ #endif // AOM_AOM_IMAGE_H_
...@@ -9,22 +9,22 @@ ...@@ -9,22 +9,22 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#ifndef VPX_VPX_INTEGER_H_ #ifndef AOM_AOM_INTEGER_H_
#define VPX_VPX_INTEGER_H_ #define AOM_AOM_INTEGER_H_
/* get ptrdiff_t, size_t, wchar_t, NULL */ /* get ptrdiff_t, size_t, wchar_t, NULL */
#include <stddef.h> #include <stddef.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define VPX_FORCE_INLINE __forceinline #define AOM_FORCE_INLINE __forceinline
#define VPX_INLINE __inline #define AOM_INLINE __inline
#else #else
#define VPX_FORCE_INLINE __inline__ __attribute__(always_inline) #define AOM_FORCE_INLINE __inline__ __attribute__(always_inline)
// TODO(jbb): Allow a way to force inline off for older compilers. // TODO(jbb): Allow a way to force inline off for older compilers.
#define VPX_INLINE inline #define AOM_INLINE inline
#endif #endif
#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(AOM_EMULATE_INTTYPES)
typedef signed char int8_t; typedef signed char int8_t;
typedef signed short int16_t; typedef signed short int16_t;
typedef signed int int32_t; typedef signed int int32_t;
...@@ -71,4 +71,4 @@ typedef size_t uintptr_t; ...@@ -71,4 +71,4 @@ typedef size_t uintptr_t;
#include <inttypes.h>