Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
ff00fc0f
Commit
ff00fc0f
authored
Mar 25, 2016
by
Adrian Grange
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change "VPX" to "AOM"
Change-Id: I6593a44de3b571193c2a4c8787ddf3b2fc24a268
parent
01dee0bb
Changes
211
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
1103 additions
and
1103 deletions
+1103
-1103
CHANGELOG
CHANGELOG
+2
-2
aom/aom_codec.h
aom/aom_codec.h
+38
-38
aom/aom_decoder.h
aom/aom_decoder.h
+42
-42
aom/aom_encoder.h
aom/aom_encoder.h
+94
-94
aom/aom_frame_buffer.h
aom/aom_frame_buffer.h
+5
-5
aom/aom_image.h
aom/aom_image.h
+50
-50
aom/aom_integer.h
aom/aom_integer.h
+8
-8
aom/internal/aom_codec_internal.h
aom/internal/aom_codec_internal.h
+26
-26
aom/internal/aom_psnr.h
aom/internal/aom_psnr.h
+3
-3
aom/src/aom_codec.c
aom/src/aom_codec.c
+17
-17
aom/src/aom_decoder.c
aom/src/aom_decoder.c
+32
-32
aom/src/aom_encoder.c
aom/src/aom_encoder.c
+55
-55
aom/src/aom_image.c
aom/src/aom_image.c
+77
-77
aom/src/svc_encodeframe.c
aom/src/svc_encodeframe.c
+54
-54
aom/svc_context.h
aom/svc_context.h
+8
-8
aom/vp8.h
aom/vp8.h
+19
-19
aom/vp8cx.h
aom/vp8cx.h
+117
-117
aom/vp8dx.h
aom/vp8dx.h
+24
-24
aom_dsp/aom_convolve.h
aom_dsp/aom_convolve.h
+3
-3
aom_dsp/aom_dsp_common.h
aom_dsp/aom_dsp_common.h
+5
-5
aom_dsp/aom_filter.h
aom_dsp/aom_filter.h
+3
-3
aom_dsp/bitreader.c
aom_dsp/bitreader.c
+1
-1
aom_dsp/bitreader.h
aom_dsp/bitreader.h
+3
-3
aom_dsp/bitreader_buffer.h
aom_dsp/bitreader_buffer.h
+3
-3
aom_dsp/bitwriter.h
aom_dsp/bitwriter.h
+3
-3
aom_dsp/bitwriter_buffer.h
aom_dsp/bitwriter_buffer.h
+3
-3
aom_dsp/fwd_txfm.h
aom_dsp/fwd_txfm.h
+3
-3
aom_dsp/inv_txfm.h
aom_dsp/inv_txfm.h
+3
-3
aom_dsp/mips/aom_convolve_msa.h
aom_dsp/mips/aom_convolve_msa.h
+3
-3
aom_dsp/mips/common_dspr2.h
aom_dsp/mips/common_dspr2.h
+3
-3
aom_dsp/mips/convolve_common_dspr2.h
aom_dsp/mips/convolve_common_dspr2.h
+3
-3
aom_dsp/mips/fwd_txfm_msa.c
aom_dsp/mips/fwd_txfm_msa.c
+4
-4
aom_dsp/mips/fwd_txfm_msa.h
aom_dsp/mips/fwd_txfm_msa.h
+5
-5
aom_dsp/mips/idct16x16_msa.c
aom_dsp/mips/idct16x16_msa.c
+34
-34
aom_dsp/mips/idct32x32_msa.c
aom_dsp/mips/idct32x32_msa.c
+8
-8
aom_dsp/mips/idct4x4_msa.c
aom_dsp/mips/idct4x4_msa.c
+2
-2
aom_dsp/mips/idct8x8_msa.c
aom_dsp/mips/idct8x8_msa.c
+18
-18
aom_dsp/mips/inv_txfm_dspr2.h
aom_dsp/mips/inv_txfm_dspr2.h
+3
-3
aom_dsp/mips/inv_txfm_msa.h
aom_dsp/mips/inv_txfm_msa.h
+44
-44
aom_dsp/mips/loopfilter_16_msa.c
aom_dsp/mips/loopfilter_16_msa.c
+18
-18
aom_dsp/mips/loopfilter_4_msa.c
aom_dsp/mips/loopfilter_4_msa.c
+4
-4
aom_dsp/mips/loopfilter_8_msa.c
aom_dsp/mips/loopfilter_8_msa.c
+14
-14
aom_dsp/mips/loopfilter_filters_dspr2.h
aom_dsp/mips/loopfilter_filters_dspr2.h
+3
-3
aom_dsp/mips/loopfilter_macros_dspr2.h
aom_dsp/mips/loopfilter_macros_dspr2.h
+3
-3
aom_dsp/mips/loopfilter_masks_dspr2.h
aom_dsp/mips/loopfilter_masks_dspr2.h
+3
-3
aom_dsp/mips/loopfilter_msa.h
aom_dsp/mips/loopfilter_msa.h
+8
-8
aom_dsp/mips/macros_msa.h
aom_dsp/mips/macros_msa.h
+3
-3
aom_dsp/mips/sad_msa.c
aom_dsp/mips/sad_msa.c
+90
-90
aom_dsp/mips/sub_pixel_variance_msa.c
aom_dsp/mips/sub_pixel_variance_msa.c
+28
-28
aom_dsp/mips/txfm_macros_msa.h
aom_dsp/mips/txfm_macros_msa.h
+3
-3
aom_dsp/mips/variance_msa.c
aom_dsp/mips/variance_msa.c
+11
-11
aom_dsp/prob.h
aom_dsp/prob.h
+5
-5
aom_dsp/quantize.h
aom_dsp/quantize.h
+3
-3
aom_dsp/ssim.h
aom_dsp/ssim.h
+3
-3
aom_dsp/txfm_common.h
aom_dsp/txfm_common.h
+3
-3
aom_dsp/variance.h
aom_dsp/variance.h
+3
-3
aom_dsp/x86/convolve.h
aom_dsp/x86/convolve.h
+3
-3
aom_dsp/x86/fwd_txfm_sse2.h
aom_dsp/x86/fwd_txfm_sse2.h
+3
-3
aom_dsp/x86/inv_txfm_sse2.h
aom_dsp/x86/inv_txfm_sse2.h
+3
-3
aom_dsp/x86/txfm_common_sse2.h
aom_dsp/x86/txfm_common_sse2.h
+3
-3
aom_mem/aom_mem.c
aom_mem/aom_mem.c
+1
-1
aom_mem/aom_mem.h
aom_mem/aom_mem.h
+5
-5
aom_mem/include/aom_mem_intrnl.h
aom_mem/include/aom_mem_intrnl.h
+3
-3
aom_ports/aom_once.h
aom_ports/aom_once.h
+3
-3
aom_ports/aom_timer.h
aom_ports/aom_timer.h
+3
-3
aom_ports/arm.h
aom_ports/arm.h
+4
-4
aom_ports/arm_cpudetect.c
aom_ports/arm_cpudetect.c
+2
-2
aom_ports/bitops.h
aom_ports/bitops.h
+3
-3
aom_ports/config.h
aom_ports/config.h
+3
-3
aom_ports/emmintrin_compat.h
aom_ports/emmintrin_compat.h
+3
-3
aom_ports/mem.h
aom_ports/mem.h
+3
-3
aom_ports/mem_ops.h
aom_ports/mem_ops.h
+10
-10
aom_ports/mem_ops_aligned.h
aom_ports/mem_ops_aligned.h
+9
-9
aom_ports/msvc.h
aom_ports/msvc.h
+3
-3
aom_ports/system_state.h
aom_ports/system_state.h
+3
-3
No files found.
CHANGELOG
View file @
ff00fc0f
...
...
@@ -20,7 +20,7 @@
- Upgrading:
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.
- Enhancements:
...
...
@@ -302,7 +302,7 @@
aomdec: test for frame corruption
aomenc: add quantizer histogram display
aomenc: add rate histogram display
Set
VPX
_FRAME_IS_DROPPABLE
Set
AOM
_FRAME_IS_DROPPABLE
update configure for ios sdk 4.3
Avoid text relocations in ARM vp8 decoder
Generate a aom.pc file for pkg-config.
...
...
aom/aom_codec.h
View file @
ff00fc0f
...
...
@@ -36,8 +36,8 @@
* Once initialized, the instance is manged using other functions from
* the aom_codec_* family.
*/
#ifndef
VPX_VPX
_CODEC_H_
#define
VPX_VPX
_CODEC_H_
#ifndef
AOM_AOM
_CODEC_H_
#define
AOM_AOM
_CODEC_H_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -84,31 +84,31 @@ 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
AOM
_CODEC_ABI_VERSION (3 +
AOM
_IMAGE_ABI_VERSION)
/**<\hideinitializer*/
/*!\brief Algorithm return codes */
typedef
enum
{
/*!\brief Operation completed without error */
VPX
_CODEC_OK
,
AOM
_CODEC_OK
,
/*!\brief Unspecified error */
VPX
_CODEC_ERROR
,
AOM
_CODEC_ERROR
,
/*!\brief Memory operation failed */
VPX
_CODEC_MEM_ERROR
,
AOM
_CODEC_MEM_ERROR
,
/*!\brief ABI version mismatch */
VPX
_CODEC_ABI_MISMATCH
,
AOM
_CODEC_ABI_MISMATCH
,
/*!\brief Algorithm does not have required capability */
VPX
_CODEC_INCAPABLE
,
AOM
_CODEC_INCAPABLE
,
/*!\brief The given bitstream is not supported.
*
* 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
* stream. */
VPX
_CODEC_UNSUP_BITSTREAM
,
AOM
_CODEC_UNSUP_BITSTREAM
,
/*!\brief Encoded bitstream uses an unsupported feature
*
...
...
@@ -117,7 +117,7 @@ typedef enum {
* 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.
*/
VPX
_CODEC_UNSUP_FEATURE
,
AOM
_CODEC_UNSUP_FEATURE
,
/*!\brief The coded data for this stream is corrupt or incomplete
*
...
...
@@ -127,17 +127,17 @@ typedef enum {
* stream or \ref MAY be treated as fatal to the current GOP. If decoding
* 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.
*
*/
VPX
_CODEC_INVALID_PARAM
,
AOM
_CODEC_INVALID_PARAM
,
/*!\brief An iterator reached the end of list.
*
*/
VPX
_CODEC_LIST_END
AOM
_CODEC_LIST_END
}
aom_codec_err_t
;
...
...
@@ -147,18 +147,18 @@ typedef enum {
* ::aom_codec_iface_t interface structure. Capabilities are extra interfaces
* 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
;
#define
VPX
_CODEC_CAP_DECODER 0x1
/**< Is a decoder */
#define
VPX
_CODEC_CAP_ENCODER 0x2
/**< Is an encoder */
#define
AOM
_CODEC_CAP_DECODER 0x1
/**< Is a decoder */
#define
AOM
_CODEC_CAP_ENCODER 0x2
/**< Is an encoder */
/*! \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.
* The available flags are specified by
AOM
_CODEC_USE_* defines.
*/
typedef
long
aom_codec_flags_t
;
...
...
@@ -211,9 +211,9 @@ typedef struct aom_codec_ctx {
* This enumeration determines the bit depth of the codec.
*/
typedef
enum
aom_bit_depth
{
VPX
_BITS_8
=
8
,
/**< 8 bits */
VPX
_BITS_10
=
10
,
/**< 10 bits */
VPX
_BITS_12
=
12
,
/**< 12 bits */
AOM
_BITS_8
=
8
,
/**< 8 bits */
AOM
_BITS_10
=
10
,
/**< 10 bits */
AOM
_BITS_12
=
12
,
/**< 12 bits */
}
aom_bit_depth_t
;
/*
...
...
@@ -236,11 +236,11 @@ typedef enum aom_bit_depth {
*
*/
int
aom_codec_version
(
void
);
#define
VPX
_VERSION_MAJOR(v) \
#define
AOM
_VERSION_MAJOR(v) \
((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 */
#define
VPX
_VERSION_PATCH(v) \
#define
AOM
_VERSION_PATCH(v) \
((v >> 0) & 0xff)
/**< extract patch from packed version */
/*!\brief Return the version major number */
...
...
@@ -337,9 +337,9 @@ const char *aom_codec_error_detail(aom_codec_ctx_t *ctx);
*
* \param[in] ctx Pointer to this instance's context
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* The codec algorithm initialized.
* \retval #
VPX
_CODEC_MEM_ERROR
* \retval #
AOM
_CODEC_MEM_ERROR
* Memory allocation failed.
*/
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);
*
* This wrapper function dispatches the request to the helper 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.
*
* 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);
* \param[in] ctx Pointer to this instance's context
* \param[in] ctrl_id Algorithm specific control identifier
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* The control request was processed.
* \retval #
VPX
_CODEC_ERROR
* \retval #
AOM
_CODEC_ERROR
* The control request was not processed.
* \retval #
VPX
_CODEC_INVALID_PARAM
* \retval #
AOM
_CODEC_INVALID_PARAM
* The data was not valid.
*/
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
VPX
_CTRL_USE_TYPE(id, typ)
#define
VPX
_CTRL_USE_TYPE_DEPRECATED(id, typ)
#define
VPX
_CTRL_VOID(id, typ)
#define
AOM
_CTRL_USE_TYPE(id, typ)
#define
AOM
_CTRL_USE_TYPE_DEPRECATED(id, typ)
#define
AOM
_CTRL_VOID(id, typ)
#else
/*!\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, ...);
* the correctly typed arguments as a wrapper to the type-unsafe internal
* 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) \
UNUSED; \
\
...
...
@@ -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
*
* 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
* codec for more information.
*
...
...
@@ -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
* 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( \
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, ...);
* It defines a static function without a data argument as a wrapper to the
* 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) \
UNUSED; \
\
...
...
@@ -461,4 +461,4 @@ aom_codec_err_t aom_codec_control_(aom_codec_ctx_t *ctx, int ctrl_id, ...);
#ifdef __cplusplus
}
#endif
#endif //
VPX_VPX
_CODEC_H_
#endif //
AOM_AOM
_CODEC_H_
aom/aom_decoder.h
View file @
ff00fc0f
...
...
@@ -8,8 +8,8 @@
* 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.
*/
#ifndef
VPX_VPX
_DECODER_H_
#define
VPX_VPX
_DECODER_H_
#ifndef
AOM_AOM
_DECODER_H_
#define
AOM_AOM
_DECODER_H_
/*!\defgroup decoder Decoder Algorithm Interface
* \ingroup codec
...
...
@@ -41,8 +41,8 @@ extern "C" {
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
#define
VPX
_DECODER_ABI_VERSION \
(3 +
VPX
_CODEC_ABI_VERSION)
/**<\hideinitializer*/
#define
AOM
_DECODER_ABI_VERSION \
(3 +
AOM
_CODEC_ABI_VERSION)
/**<\hideinitializer*/
/*! \brief Decoder capabilities bitfield
*
...
...
@@ -50,14 +50,14 @@ extern "C" {
* ::aom_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.
* The available flags are specified by
AOM
_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
#define
AOM
_CODEC_CAP_PUT_SLICE 0x10000
/**< Will issue put_slice callbacks */
#define
AOM
_CODEC_CAP_PUT_FRAME 0x20000
/**< Will issue put_frame callbacks */
#define
AOM
_CODEC_CAP_POSTPROC 0x40000
/**< Can postprocess decoded frame */
#define
AOM
_CODEC_CAP_ERROR_CONCEALMENT 0x80000
/**< 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 */
/*! \brief Initialization-time Feature Enabling
...
...
@@ -65,19 +65,19 @@ extern "C" {
* 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.
* 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 */
#define
VPX
_CODEC_CAP_EXTERNAL_FRAME_BUFFER 0x400000
#define
AOM
_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
#define
AOM
_CODEC_USE_POSTPROC 0x10000
/**< Postprocess decoded frame */
#define
AOM
_CODEC_USE_ERROR_CONCEALMENT 0x20000
/**< 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 */
#define
VPX
_CODEC_USE_FRAME_THREADING 0x80000
#define
AOM
_CODEC_USE_FRAME_THREADING 0x80000
/**< Enable frame-based multi-threading */
/*!\brief Stream properties
...
...
@@ -124,12 +124,12 @@ typedef struct aom_codec_dec_cfg {
* \param[in] ctx Pointer to this instance's context.
* \param[in] iface Pointer to the algorithm interface to use.
* \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
*
VPX
_DECODER_ABI_VERSION
* \retval #
VPX
_CODEC_OK
*
AOM
_DECODER_ABI_VERSION
* \retval #
AOM
_CODEC_OK
* The decoder algorithm initialized.
* \retval #
VPX
_CODEC_MEM_ERROR
* \retval #
AOM
_CODEC_MEM_ERROR
* Memory allocation failed.
*/
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.
*/
#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
*
...
...
@@ -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
* be NULL.
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* Bitstream is parsable and stream information updated
*/
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
* be NULL.
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* Bitstream is parsable and stream information updated
*/
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
* time stamp) order. Frames produced will always be in PTS (presentation
* 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
* \#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
...
...
@@ -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] 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.
* \param[in] data_sz Size of the coded data, in bytes.
* \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,
* \param[in] deadline Soft deadline the decoder should attempt to meet,
* 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,
* see the descriptions of the other error codes in ::aom_codec_err_t
* for recoverability capabilities.
...
...
@@ -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
*
* 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
* 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,
* \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* Callback successfully registered.
* \retval #
VPX
_CODEC_ERROR
* \retval #
AOM
_CODEC_ERROR
* Decoder context not initialized, or algorithm not capable of
* posting slice completion.
*/
...
...
@@ -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
*
* 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
* 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,
* \param[in] cb Pointer to the callback function
* \param[in] user_priv User's private data
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* Callback successfully registered.
* \retval #
VPX
_CODEC_ERROR
* \retval #
AOM
_CODEC_ERROR
* Decoder context not initialized, or algorithm not capable of
* posting slice completion.
*/
...
...
@@ -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
*
* 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
* 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
* 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,
* \param[in] cb_release Pointer to the release callback function
* \param[in] cb_priv Callback's private data
*
* \retval #
VPX
_CODEC_OK
* \retval #
AOM
_CODEC_OK
* External frame buffers will be used by libaom.
* \retval #
VPX
_CODEC_INVALID_PARAM
* \retval #
AOM
_CODEC_INVALID_PARAM
* One or more of the callbacks were NULL.
* \retval #
VPX
_CODEC_ERROR
* \retval #
AOM
_CODEC_ERROR
* Decoder context not initialized, or algorithm not capable of
* using external frame buffers.
*
* \note
* When decoding VP9, the application may be required to pass in at least
* #
VPX
_MAXIMUM_WORK_BUFFERS external frame
* #
AOM
_MAXIMUM_WORK_BUFFERS external frame
* buffers.
*/
aom_codec_err_t
aom_codec_set_frame_buffer_functions
(
...
...
@@ -362,4 +362,4 @@ aom_codec_err_t aom_codec_set_frame_buffer_functions(
#ifdef __cplusplus
}
#endif
#endif //
VPX_VPX
_DECODER_H_
#endif //
AOM_AOM
_DECODER_H_
aom/aom_encoder.h
View file @
ff00fc0f
...
...
@@ -8,8 +8,8 @@
* 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.
*/
#ifndef
VPX_VPX
_ENCODER_H_
#define
VPX_VPX
_ENCODER_H_
#ifndef
AOM_AOM
_ENCODER_H_
#define
AOM_AOM
_ENCODER_H_
/*!\defgroup encoder Encoder Algorithm Interface
* \ingroup codec
...
...
@@ -35,25 +35,25 @@ extern "C" {
/*! Temporal Scalability: Maximum length of the sequence defining frame
* layer membership
*/
#define
VPX
_TS_MAX_PERIODICITY 16
#define
AOM
_TS_MAX_PERIODICITY 16
/*! Temporal Scalability: Maximum number of coding layers */
#define
VPX
_TS_MAX_LAYERS 5
#define
AOM
_TS_MAX_LAYERS 5
/*!\deprecated Use #
VPX
_TS_MAX_PERIODICITY instead. */
#define MAX_PERIODICITY
VPX
_TS_MAX_PERIODICITY
/*!\deprecated Use #
AOM
_TS_MAX_PERIODICITY instead. */
#define MAX_PERIODICITY
AOM
_TS_MAX_PERIODICITY
/*! Temporal+Spatial Scalability: Maximum number of coding layers */
#define
VPX
_MAX_LAYERS 12 // 3 temporal + 4 spatial layers are allowed.
#define
AOM
_MAX_LAYERS 12 // 3 temporal + 4 spatial layers are allowed.
/*!\deprecated Use #
VPX
_MAX_LAYERS instead. */
#define MAX_LAYERS
VPX
_MAX_LAYERS // 3 temporal + 4 spatial layers allowed.
/*!\deprecated Use #
AOM
_MAX_LAYERS instead. */
#define MAX_LAYERS
AOM
_MAX_LAYERS // 3 temporal + 4 spatial layers allowed.
/*! Spatial Scalability: Maximum number of coding layers */
#define
VPX
_SS_MAX_LAYERS 5
#define
AOM
_SS_MAX_LAYERS 5
/*! Spatial Scalability: Default number of coding layers */
#define
VPX
_SS_DEFAULT_LAYERS 1
#define
AOM
_SS_DEFAULT_LAYERS 1
/*!\brief Current ABI version number
*
...
...
@@ -63,8 +63,8 @@ extern "C" {
* types, removing or reassigning enums, adding/removing/rearranging
* fields to structures
*/
#define
VPX
_ENCODER_ABI_VERSION \
(5 +
VPX
_CODEC_ABI_VERSION)
/**<\hideinitializer*/
#define
AOM
_ENCODER_ABI_VERSION \
(5 +
AOM
_CODEC_ABI_VERSION)
/**<\hideinitializer*/
/*! \brief Encoder capabilities bitfield
*
...
...
@@ -73,32 +73,32 @@ extern "C" {
* interfaces or functionality, and are not required to be supported
* by an encoder.
*
* The available flags are specified by
VPX
_CODEC_CAP_* defines.
* The available flags are specified by
AOM
_CODEC_CAP_* defines.
*/
#define
VPX
_CODEC_CAP_PSNR 0x10000
/**< Can issue PSNR packets */
#define
AOM
_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
* own
AOM
_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
#define
AOM
_CODEC_CAP_OUTPUT_PARTITION 0x20000
/*! Can support input images at greater than 8 bitdepth.
*/
#define
VPX
_CODEC_CAP_HIGHBITDEPTH 0x40000
#define
AOM
_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.
* The available flags are specified by
AOM
_CODEC_USE_* defines.
*/
#define
VPX
_CODEC_USE_PSNR 0x10000
/**< Calculate PSNR on each frame */
#define
VPX
_CODEC_USE_OUTPUT_PARTITION 0x20000
#define
AOM
_CODEC_USE_PSNR 0x10000
/**< Calculate PSNR on each frame */
#define
AOM
_CODEC_USE_OUTPUT_PARTITION 0x20000
/**< Make the encoder output one partition at a time. */
#define
VPX
_CODEC_USE_HIGHBITDEPTH 0x40000
/**< Use high bitdepth */
#define
AOM
_CODEC_USE_HIGHBITDEPTH 0x40000
/**< Use high bitdepth */
/*!\brief Generic fixed size buffer structure
*
...
...
@@ -124,13 +124,13 @@ typedef int64_t aom_codec_pts_t;
* support frame types that are codec specific (MPEG-1 D-frames for example)
*/
typedef
uint32_t
aom_codec_frame_flags_t
;
#define
VPX
_FRAME_IS_KEY 0x1
/**< frame is the start of a GOP */
#define
VPX
_FRAME_IS_DROPPABLE 0x2
#define
AOM
_FRAME_IS_KEY 0x1
/**< frame is the start of a GOP */
#define
AOM
_FRAME_IS_DROPPABLE 0x2
/**< frame can be dropped without affecting the stream (no future frame depends
* on this one) */
#define
VPX
_FRAME_IS_INVISIBLE 0x4
#define
AOM
_FRAME_IS_INVISIBLE 0x4
/**< frame should be decoded but will not be shown */
#define
VPX
_FRAME_IS_FRAGMENT 0x8
#define
AOM
_FRAME_IS_FRAGMENT 0x8
/**< this is a fragment of the encoded frame */
/*!\brief Error Resilient flags
...
...
@@ -140,9 +140,9 @@ typedef uint32_t aom_codec_frame_flags_t;
* aom_codec_enc_cfg::g_error_resilient variable.
*/
typedef
uint32_t
aom_codec_er_flags_t
;
#define
VPX
_ERROR_RESILIENT_DEFAULT 0x1
#define
AOM
_ERROR_RESILIENT_DEFAULT 0x1
/**< Improve resiliency against losses of whole frames */
#define
VPX
_ERROR_RESILIENT_PARTITIONS 0x2
#define
AOM
_ERROR_RESILIENT_PARTITIONS 0x2
/**< The frame partitions are independently decodable by the bool decoder,
* meaning that partitions can be decoded even though earlier partitions have
* been lost. Note that intra prediction is still done over the partition
...
...
@@ -155,17 +155,17 @@ typedef uint32_t aom_codec_er_flags_t;
* extend this list to provide additional functionality.
*/
enum
aom_codec_cx_pkt_kind
{
VPX
_CODEC_CX_FRAME_PKT
,
/**< Compressed video frame */
VPX
_CODEC_STATS_PKT
,
/**< Two-pass statistics for this frame */
VPX
_CODEC_FPMB_STATS_PKT
,
/**< first pass mb statistics for this frame */
VPX
_CODEC_PSNR_PKT
,
/**< PSNR statistics for this frame */
AOM
_CODEC_CX_FRAME_PKT
,
/**< Compressed video frame */
AOM
_CODEC_STATS_PKT
,
/**< Two-pass statistics for this frame */
AOM
_CODEC_FPMB_STATS_PKT
,
/**< first pass mb statistics for this frame */
AOM
_CODEC_PSNR_PKT
,
/**< PSNR statistics for this frame */
// Spatial SVC is still experimental and may be removed before the next ABI
// bump.
#if
VPX
_ENCODER_ABI_VERSION > (5 +
VPX
_CODEC_ABI_VERSION)
VPX
_CODEC_SPATIAL_SVC_LAYER_SIZES
,
/**< Sizes for each layer in this frame*/
VPX
_CODEC_SPATIAL_SVC_LAYER_PSNR
,
/**< PSNR for each layer in this frame*/
#if
AOM
_ENCODER_ABI_VERSION > (5 +
AOM
_CODEC_ABI_VERSION)
AOM
_CODEC_SPATIAL_SVC_LAYER_SIZES
,
/**< Sizes for each layer in this frame*/
AOM
_CODEC_SPATIAL_SVC_LAYER_PSNR
,
/**< PSNR for each layer in this frame*/
#endif
VPX
_CODEC_CUSTOM_PKT
=
256
/**< Algorithm extensions */
AOM
_CODEC_CUSTOM_PKT
=
256
/**< Algorithm extensions */
};
/*!\brief Encoder output packet
...
...
@@ -201,9 +201,9 @@ typedef struct aom_codec_cx_pkt {
aom_fixed_buf_t
raw
;
/**< data for arbitrary packets */
// Spatial SVC is still experimental and may be removed before the next
// ABI bump.
#if
VPX
_ENCODER_ABI_VERSION > (5 +
VPX
_CODEC_ABI_VERSION)
size_t
layer_sizes
[
VPX
_SS_MAX_LAYERS
];
struct
aom_psnr_pkt
layer_psnr
[
VPX
_SS_MAX_LAYERS
];
#if
AOM
_ENCODER_ABI_VERSION > (5 +
AOM
_CODEC_ABI_VERSION)
size_t
layer_sizes
[
AOM
_SS_MAX_LAYERS
];
struct
aom_psnr_pkt
layer_psnr
[
AOM
_SS_MAX_LAYERS
];
#endif
/* This packet size is fixed to allow codecs to extend this
...
...
@@ -242,42 +242,42 @@ typedef struct aom_rational {
/*!\brief Multi-pass Encoding Pass */
enum
aom_enc_pass
{
VPX
_RC_ONE_PASS
,
/**< Single pass mode */
VPX
_RC_FIRST_PASS
,
/**< First pass of multi-pass mode */
VPX
_RC_LAST_PASS
/**< Final pass of multi-pass mode */
AOM
_RC_ONE_PASS
,
/**< Single pass mode */
AOM
_RC_FIRST_PASS
,
/**< First pass of multi-pass mode */
AOM
_RC_LAST_PASS
/**< Final pass of multi-pass mode */
};