Commit ff00fc0f authored by Adrian Grange's avatar Adrian Grange
Browse files

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_
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* 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_DECODER_H_ #ifndef AOM_AOM_DECODER_H_
#define VPX_VPX_DECODER_H_ #define AOM_AOM_DECODER_H_
/*!\defgroup decoder Decoder Algorithm Interface /*!\defgroup decoder Decoder Algorithm Interface
* \ingroup codec * \ingroup codec
...@@ -41,8 +41,8 @@ extern "C" { ...@@ -41,8 +41,8 @@ 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_DECODER_ABI_VERSION \ #define AOM_DECODER_ABI_VERSION \
(3 + VPX_CODEC_ABI_VERSION) /**<\hideinitializer*/ (3 + AOM_CODEC_ABI_VERSION) /**<\hideinitializer*/
/*! \brief Decoder capabilities bitfield /*! \brief Decoder capabilities bitfield
* *
...@@ -50,14 +50,14 @@ extern "C" { ...@@ -50,14 +50,14 @@ extern "C" {
* ::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 by a decoder. * or functionality, and are not required to be supported by a decoder.
* *
* The available flags are specified by VPX_CODEC_CAP_* defines. * The available flags are specified by AOM_CODEC_CAP_* defines.
*/ */
#define VPX_CODEC_CAP_PUT_SLICE 0x10000 /**< Will issue put_slice callbacks */ #define AOM_CODEC_CAP_PUT_SLICE 0x10000 /**< Will issue put_slice callbacks */
#define VPX_CODEC_CAP_PUT_FRAME 0x20000 /**< Will issue put_frame callbacks */ #define AOM_CODEC_CAP_PUT_FRAME 0x20000 /**< Will issue put_frame callbacks */
#define VPX_CODEC_CAP_POSTPROC 0x40000 /**< Can postprocess decoded frame */ #define AOM_CODEC_CAP_POSTPROC 0x40000 /**< Can postprocess decoded frame */
#define VPX_CODEC_CAP_ERROR_CONCEALMENT 0x80000 #define AOM_CODEC_CAP_ERROR_CONCEALMENT 0x80000
/**< Can conceal errors due to packet loss */ /**< Can conceal errors due to packet loss */
#define VPX_CODEC_CAP_INPUT_FRAGMENTS 0x100000 #define AOM_CODEC_CAP_INPUT_FRAGMENTS 0x100000
/**< Can receive encoded frames one fragment at a time */ /**< Can receive encoded frames one fragment at a time */
/*! \brief Initialization-time Feature Enabling /*! \brief Initialization-time Feature Enabling
...@@ -65,19 +65,19 @@ extern "C" { ...@@ -65,19 +65,19 @@ extern "C" {
* 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.
*/ */
#define VPX_CODEC_CAP_FRAME_THREADING 0x200000 #define AOM_CODEC_CAP_FRAME_THREADING 0x200000
/**< Can support frame-based multi-threading */ /**< Can support frame-based multi-threading */
#define VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x400000 #define AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x400000
/**< Can support external frame buffers */ /**< Can support external frame buffers */
#define VPX_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */ #define AOM_CODEC_USE_POSTPROC 0x10000 /**< Postprocess decoded frame */
#define VPX_CODEC_USE_ERROR_CONCEALMENT 0x20000 #define AOM_CODEC_USE_ERROR_CONCEALMENT 0x20000
/**< Conceal errors in decoded frames */ /**< Conceal errors in decoded frames */
#define VPX_CODEC_USE_INPUT_FRAGMENTS 0x40000 #define AOM_CODEC_USE_INPUT_FRAGMENTS 0x40000
/**< The input frame should be passed to the decoder one fragment at a time */ /**< The input frame should be passed to the decoder one fragment at a time */
#define VPX_CODEC_USE_FRAME_THREADING 0x80000 #define AOM_CODEC_USE_FRAME_THREADING 0x80000
/**< Enable frame-based multi-threading */ /**< Enable frame-based multi-threading */
/*!\brief Stream properties /*!\brief Stream properties
...@@ -124,12 +124,12 @@ typedef struct aom_codec_dec_cfg { ...@@ -124,12 +124,12 @@ typedef struct aom_codec_dec_cfg {
* \param[in] ctx Pointer to this instance's context. * \param[in] ctx Pointer to this instance's context.
* \param[in] iface Pointer to the algorithm interface to use. * \param[in] iface Pointer to the algorithm interface to use.
* \param[in] cfg Configuration to use, if known. May be NULL. * \param[in] cfg Configuration to use, if known. May be NULL.
* \param[in] flags Bitfield of VPX_CODEC_USE_* flags * \param[in] flags Bitfield of AOM_CODEC_USE_* flags
* \param[in] ver ABI version number. Must be set to * \param[in] ver ABI version number. Must be set to
* VPX_DECODER_ABI_VERSION * AOM_DECODER_ABI_VERSION
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* The decoder algorithm initialized. * The decoder algorithm initialized.
* \retval #VPX_CODEC_MEM_ERROR * \retval #AOM_CODEC_MEM_ERROR
* Memory allocation failed. * Memory allocation failed.
*/ */
aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx, aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx,
...@@ -142,7 +142,7 @@ aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx, ...@@ -142,7 +142,7 @@ aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx,
* Ensures the ABI version parameter is properly set. * Ensures the ABI version parameter is properly set.
*/ */
#define aom_codec_dec_init(ctx, iface, cfg, flags) \ #define aom_codec_dec_init(ctx, iface, cfg, flags) \
aom_codec_dec_init_ver(ctx, iface, cfg, flags, VPX_DECODER_ABI_VERSION) aom_codec_dec_init_ver(ctx, iface, cfg, flags, AOM_DECODER_ABI_VERSION)
/*!\brief Parse stream info from a buffer /*!\brief Parse stream info from a buffer
* *
...@@ -158,7 +158,7 @@ aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx, ...@@ -158,7 +158,7 @@ aom_codec_err_t aom_codec_dec_init_ver(aom_codec_ctx_t *ctx,
* clobbered by the algorithm. This parameter \ref MAY * clobbered by the algorithm. This parameter \ref MAY
* be NULL. * be NULL.
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* Bitstream is parsable and stream information updated * Bitstream is parsable and stream information updated
*/ */
aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface, aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface,
...@@ -176,7 +176,7 @@ aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface, ...@@ -176,7 +176,7 @@ aom_codec_err_t aom_codec_peek_stream_info(aom_codec_iface_t *iface,
* clobbered by the algorithm. This parameter \ref MAY * clobbered by the algorithm. This parameter \ref MAY
* be NULL. * be NULL.
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* Bitstream is parsable and stream information updated * Bitstream is parsable and stream information updated
*/ */
aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx, aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
...@@ -189,7 +189,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx, ...@@ -189,7 +189,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
* generated, as appropriate. Encoded data \ref MUST be passed in DTS (decode * generated, as appropriate. Encoded data \ref MUST be passed in DTS (decode
* time stamp) order. Frames produced will always be in PTS (presentation * time stamp) order. Frames produced will always be in PTS (presentation
* time stamp) order. * time stamp) order.
* If the decoder is configured with VPX_CODEC_USE_INPUT_FRAGMENTS enabled, * If the decoder is configured with AOM_CODEC_USE_INPUT_FRAGMENTS enabled,
* data and data_sz can contain a fragment of the encoded frame. Fragment * data and data_sz can contain a fragment of the encoded frame. Fragment
* \#n must contain at least partition \#n, but can also contain subsequent * \#n must contain at least partition \#n, but can also contain subsequent
* partitions (\#n+1 - \#n+i), and if so, fragments \#n+1, .., \#n+i must * partitions (\#n+1 - \#n+i), and if so, fragments \#n+1, .., \#n+i must
...@@ -199,7 +199,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx, ...@@ -199,7 +199,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
* *
* \param[in] ctx Pointer to this instance's context * \param[in] ctx Pointer to this instance's context
* \param[in] data Pointer to this block of new coded data. If * \param[in] data Pointer to this block of new coded data. If
* NULL, a VPX_CODEC_CB_PUT_FRAME event is posted * NULL, a AOM_CODEC_CB_PUT_FRAME event is posted
* for the previously decoded frame. * for the previously decoded frame.
* \param[in] data_sz Size of the coded data, in bytes. * \param[in] data_sz Size of the coded data, in bytes.
* \param[in] user_priv Application specific data to associate with * \param[in] user_priv Application specific data to associate with
...@@ -207,7 +207,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx, ...@@ -207,7 +207,7 @@ aom_codec_err_t aom_codec_get_stream_info(aom_codec_ctx_t *ctx,
* \param[in] deadline Soft deadline the decoder should attempt to meet, * \param[in] deadline Soft deadline the decoder should attempt to meet,
* in us. Set to zero for unlimited. * in us. Set to zero for unlimited.
* *
* \return Returns #VPX_CODEC_OK if the coded data was processed completely * \return Returns #AOM_CODEC_OK if the coded data was processed completely
* and future pictures can be decoded without error. Otherwise, * and future pictures can be decoded without error. Otherwise,
* see the descriptions of the other error codes in ::aom_codec_err_t * see the descriptions of the other error codes in ::aom_codec_err_t
* for recoverability capabilities. * for recoverability capabilities.
...@@ -237,10 +237,10 @@ aom_image_t *aom_codec_get_frame(aom_codec_ctx_t *ctx, aom_codec_iter_t *iter); ...@@ -237,10 +237,10 @@ aom_image_t *aom_codec_get_frame(aom_codec_ctx_t *ctx, aom_codec_iter_t *iter);
/*!\defgroup cap_put_frame Frame-Based Decoding Functions /*!\defgroup cap_put_frame Frame-Based Decoding Functions
* *
* The following functions are required to be implemented for all decoders * The following functions are required to be implemented for all decoders
* that advertise the VPX_CODEC_CAP_PUT_FRAME capability. Calling these * that advertise the AOM_CODEC_CAP_PUT_FRAME capability. Calling these
* functions * functions
* for codecs that don't advertise this capability will result in an error * for codecs that don't advertise this capability will result in an error
* code being returned, usually VPX_CODEC_ERROR * code being returned, usually AOM_CODEC_ERROR
* @{ * @{
*/ */
...@@ -261,9 +261,9 @@ typedef void (*aom_codec_put_frame_cb_fn_t)(void *user_priv, ...@@ -261,9 +261,9 @@ typedef void (*aom_codec_put_frame_cb_fn_t)(void *user_priv,
* \param[in] cb Pointer to the callback function * \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data * \param[in] user_priv User's private data
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* Callback successfully registered. * Callback successfully registered.
* \retval #VPX_CODEC_ERROR * \retval #AOM_CODEC_ERROR
* Decoder context not initialized, or algorithm not capable of * Decoder context not initialized, or algorithm not capable of
* posting slice completion. * posting slice completion.
*/ */
...@@ -276,10 +276,10 @@ aom_codec_err_t aom_codec_register_put_frame_cb(aom_codec_ctx_t *ctx, ...@@ -276,10 +276,10 @@ aom_codec_err_t aom_codec_register_put_frame_cb(aom_codec_ctx_t *ctx,
/*!\defgroup cap_put_slice Slice-Based Decoding Functions /*!\defgroup cap_put_slice Slice-Based Decoding Functions
* *
* The following functions are required to be implemented for all decoders * The following functions are required to be implemented for all decoders
* that advertise the VPX_CODEC_CAP_PUT_SLICE capability. Calling these * that advertise the AOM_CODEC_CAP_PUT_SLICE capability. Calling these
* functions * functions
* for codecs that don't advertise this capability will result in an error * for codecs that don't advertise this capability will result in an error
* code being returned, usually VPX_CODEC_ERROR * code being returned, usually AOM_CODEC_ERROR
* @{ * @{
*/ */
...@@ -302,9 +302,9 @@ typedef void (*aom_codec_put_slice_cb_fn_t)(void *user_priv, ...@@ -302,9 +302,9 @@ typedef void (*aom_codec_put_slice_cb_fn_t)(void *user_priv,
* \param[in] cb Pointer to the callback function * \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data * \param[in] user_priv User's private data
* *
* \retval #VPX_CODEC_OK * \retval #AOM_CODEC_OK
* Callback successfully registered. * Callback successfully registered.
* \retval #VPX_CODEC_ERROR * \retval #AOM_CODEC_ERROR
* Decoder context not initialized, or algorithm not capable of * Decoder context not initialized, or algorithm not capable of
* posting slice completion. * posting slice completion.
*/ */
...@@ -317,9 +317,9 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx, ...@@ -317,9 +317,9 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx,
/*!\defgroup cap_external_frame_buffer External Frame Buffer Functions /*!\defgroup cap_external_frame_buffer External Frame Buffer Functions
* *
* The following section is required to be implemented for all decoders * The following section is required to be implemented for all decoders
* that advertise the VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER capability. * that advertise the AOM_CODEC_CAP_EXTERNAL_FRAME_BUFFER capability.
* Calling this function for codecs that don't advertise this capability * Calling this function for codecs that don't advertise this capability
* will result in an error code being returned, usually VPX_CODEC_ERROR. * will result in an error code being returned, usually AOM_CODEC_ERROR.
* *
* \note * \note
* Currently this only works with VP9. * Currently this only works with VP9.
...@@ -339,17 +339,17 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx, ...@@ -339,17 +339,17 @@ aom_codec_err_t aom_codec_register_put_slice_cb(aom_codec_ctx_t *ctx,
* \param[in] cb_release Pointer to the release callback function * \param[in] cb_release Pointer to the release callback function
* \param[in] cb_priv Callback's private data * \param[in] cb_priv Callback's private data
* *
* \retval