aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-25 22:44:34 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-25 22:44:34 +0000
commitb7beff96f13d7008e8913131658d61529f3456ba (patch)
tree0513562c97b45080278619e842910b2bf0a1ca64
parentcb871b1706ad1e7cbcb6c0d468e456ddf7fce94a (diff)
downloadusdx-b7beff96f13d7008e8913131658d61529f3456ba.tar.gz
usdx-b7beff96f13d7008e8913131658d61529f3456ba.tar.xz
usdx-b7beff96f13d7008e8913131658d61529f3456ba.zip
cosmetics. no code change
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3057 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-2.1/libavutil/buffer.pas423
-rw-r--r--src/lib/ffmpeg-2.1/libavutil/frame.pas570
2 files changed, 495 insertions, 498 deletions
diff --git a/src/lib/ffmpeg-2.1/libavutil/buffer.pas b/src/lib/ffmpeg-2.1/libavutil/buffer.pas
index e4f40fc9..6eead1dc 100644
--- a/src/lib/ffmpeg-2.1/libavutil/buffer.pas
+++ b/src/lib/ffmpeg-2.1/libavutil/buffer.pas
@@ -28,59 +28,65 @@
*)
const
- (**
- * Always treat the buffer as read-only, even when it has only one
- * reference.
- *)
+(**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ *)
AV_BUFFER_FLAG_READONLY = (1 << 0);
type
- (**
- * @defgroup lavu_buffer AVBuffer
- * @ingroup lavu_data
- *
- * @{
- * AVBuffer is an API for reference-counted data buffers.
- *
- * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
- * represents the data buffer itself; it is opaque and not meant to be accessed
- * by the caller directly, but only through AVBufferRef. However, the caller may
- * e.g. compare two AVBuffer pointers to check whether two different references
- * are describing the same data buffer. AVBufferRef represents a single
- * reference to an AVBuffer and it is the object that may be manipulated by the
- * caller directly.
- *
- * There are two functions provided for creating a new AVBuffer with a single
- * reference -- av_buffer_alloc() to just allocate a new buffer, and
- * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
- * reference, additional references may be created with av_buffer_ref().
- * Use av_buffer_unref() to free a reference (this will automatically free the
- * data once all the references are freed).
- *
- * The convention throughout this API and the rest of FFmpeg is such that the
- * buffer is considered writable if there exists only one reference to it (and
- * it has not been marked as read-only). The av_buffer_is_writable() function is
- * provided to check whether this is true and av_buffer_make_writable() will
- * automatically create a new writable buffer when necessary.
- * Of course nothing prevents the calling code from violating this convention,
- * however that is safe only when all the existing references are under its
- * control.
- *
- * @note Referencing and unreferencing the buffers is thread-safe and thus
- * may be done from multiple threads simultaneously without any need for
- * additional locking.
- *
- * @note Two different references to the same buffer can point to different
- * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
- *)
+(**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of FFmpeg is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ *)
- (**
- * A reference counted buffer type. It is opaque and is meant to be used through
- * references (AVBufferRef).
- *)
+(**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ *)
TAVBuffer = record
end;
+(**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ *)
PPAVBufferRef = ^PAVBufferRef;
PAVBufferRef = ^TAVBufferRef;
TAVBufferRef = record
@@ -89,11 +95,11 @@ type
* The data buffer. It is considered writable if and only if
* this is the only reference to the buffer, in which case
* av_buffer_is_writable() returns 1.
- *)
- data: PByte;
+ *)
+ data: PByte;
(**
* Size of data in bytes.
- *)
+ *)
size: cint;
end;
@@ -101,186 +107,177 @@ type
TFree = procedure(opaque: pointer; data: pbyte);
TAlloc = function(size: cint): PAVBufferRef;
- (**
- * The buffer pool. This structure is opaque and not meant to be accessed
- * directly. It is allocated with av_buffer_pool_init() and freed with
- * av_buffer_pool_uninit().
- *)
+(**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ *)
PPAVBufferPool = ^PAVBufferPool;
PAVBufferPool = ^TAVBufferPool;
TAVBufferPool = record
end;
+(**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ *)
+function av_buffer_alloc(size: cint): PAVBufferRef;
+ cdecl; external av__util;
- (**
- * Allocate an AVBuffer of the given size using av_malloc().
- *
- * @return an AVBufferRef of given size or NULL when out of memory
- *)
- function av_buffer_alloc(size: cint): PAVBufferRef;
- cdecl; external av__util;
-
- (**
- * Create an AVBuffer from an existing array.
- *
- * If this function is successful, data is owned by the AVBuffer. The caller may
- * only access data through the returned AVBufferRef and references derived from
- * it.
- * If this function fails, data is left untouched.
- * @param data data array
- * @param size size of data in bytes
- * @param free a callback for freeing this buffer's data
- * @param opaque parameter to be got for processing or passed to free
- * @param flags a combination of AV_BUFFER_FLAG_*
- *
- * @return an AVBufferRef referring to data on success, NULL on failure.
- *)
-
- function av_buffer_create(data: PByte; size: cint;
- free: TFree;
- opaque: pointer; flags: cint): PAVBufferRef;
- cdecl; external av__util;
-
- (**
- * Default free callback, which calls av_free() on the buffer data.
- * This function is meant to be passed to av_buffer_create(), not called
- * directly.
- *)
- procedure av_buffer_default_free(opaque: pointer; data: pbyte);
- cdecl; external av__util;
+(**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data data array
+ * @param size size of data in bytes
+ * @param free a callback for freeing this buffer's data
+ * @param opaque parameter to be got for processing or passed to free
+ * @param flags a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ *)
- (**
- * Create a new reference to an AVBuffer.
- *
- * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
- * failure.
- *)
- function av_buffer_ref(buf: PAVBufferRef): PAVBufferRef;
- cdecl; external av__util;
+function av_buffer_create(data: PByte; size: cint;
+ free: TFree;
+ opaque: pointer; flags: cint): PAVBufferRef;
+ cdecl; external av__util;
- (**
- * Free a given reference and automatically free the buffer if there are no more
- * references to it.
- *
- * @param buf the reference to be freed. The pointer is set to NULL on return.
- *)
- procedure av_buffer_unref(buf: PPAVBufferRef);
- cdecl; external av__util;
+(**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ *)
+procedure av_buffer_default_free(opaque: pointer; data: pbyte);
+ cdecl; external av__util;
- (**
- * @return 1 if the caller may write to the data referred to by buf (which is
- * true if and only if buf is the only reference to the underlying AVBuffer).
- * Return 0 otherwise.
- * A positive answer is valid until av_buffer_ref() is called on buf.
- *)
- function av_buffer_is_writable(buf: {const} PAVBufferRef): cint;
- cdecl; external av__util;
+(**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ *)
+function av_buffer_ref(buf: PAVBufferRef): PAVBufferRef;
+ cdecl; external av__util;
- (**
- * @return the opaque parameter set by av_buffer_create.
- *)
- procedure av_buffer_get_opaque(buf: {const} PAVBufferRef);
- cdecl; external av__util;
+(**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ *)
+procedure av_buffer_unref(buf: PPAVBufferRef);
+ cdecl; external av__util;
- function av_buffer_get_ref_count(buf: {const} PAVBufferRef): cint;
- cdecl; external av__util;
+(**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ *)
+function av_buffer_is_writable(buf: {const} PAVBufferRef): cint;
+ cdecl; external av__util;
- (**
- * Create a writable reference from a given buffer reference, avoiding data copy
- * if possible.
- *
- * @param buf buffer reference to make writable. On success, buf is either left
- * untouched, or it is unreferenced and a new writable AVBufferRef is
- * written in its place. On failure, buf is left untouched.
- * @return 0 on success, a negative AVERROR on failure.
- *)
- function av_buffer_make_writable(buf: PPAVBufferRef): cint;
- cdecl; external av__util;
+(**
+ * @return the opaque parameter set by av_buffer_create.
+ *)
+procedure av_buffer_get_opaque(buf: {const} PAVBufferRef);
+ cdecl; external av__util;
- (**
- * Reallocate a given buffer.
- *
- * @param buf a buffer reference to reallocate. On success, buf will be
- * unreferenced and a new reference with the required size will be
- * written in its place. On failure buf will be left untouched. *buf
- * may be NULL, then a new buffer is allocated.
- * @param size required new buffer size.
- * @return 0 on success, a negative AVERROR on failure.
- *
- * @note the buffer is actually reallocated with av_realloc() only if it was
- * initially allocated through av_buffer_realloc(NULL) and there is only one
- * reference to it (i.e. the one passed to this function). In all other cases
- * a new buffer is allocated and the data is copied.
- *)
- function av_buffer_realloc(buf: PPAVBufferRef; size: cint): cint;
- cdecl; external av__util;
+function av_buffer_get_ref_count(buf: {const} PAVBufferRef): cint;
+ cdecl; external av__util;
- (**
- * @}
- *)
+(**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ * untouched, or it is unreferenced and a new writable AVBufferRef is
+ * written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ *)
+function av_buffer_make_writable(buf: PPAVBufferRef): cint;
+ cdecl; external av__util;
- (**
- * @defgroup lavu_bufferpool AVBufferPool
- * @ingroup lavu_data
- *
- * @{
- * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
- *
- * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
- * meant to solve this in cases when the caller needs a set of buffers of the
- * same size (the most obvious use case being buffers for raw video or audio
- * frames).
- *
- * At the beginning, the user must call av_buffer_pool_init() to create the
- * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
- * get a reference to a new buffer, similar to av_buffer_alloc(). This new
- * reference works in all aspects the same way as the one created by
- * av_buffer_alloc(). However, when the last reference to this buffer is
- * unreferenced, it is returned to the pool instead of being freed and will be
- * reused for subsequent av_buffer_pool_get() calls.
- *
- * When the caller is done with the pool and no longer needs to allocate any new
- * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
- * Once all the buffers are released, it will automatically be freed.
- *
- * Allocating and releasing buffers with this API is thread-safe as long as
- * either the default alloc callback is used, or the user-supplied one is
- * thread-safe.
- *)
+(**
+ * Reallocate a given buffer.
+ *
+ * @param buf a buffer reference to reallocate. On success, buf will be
+ * unreferenced and a new reference with the required size will be
+ * written in its place. On failure buf will be left untouched. *buf
+ * may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ *)
+function av_buffer_realloc(buf: PPAVBufferRef; size: cint): cint;
+ cdecl; external av__util;
- (**
- * Allocate and initialize a buffer pool.
- *
- * @param size size of each buffer in this pool
- * @param alloc a function that will be used to allocate new buffers when the
- * pool is empty. May be NULL, then the default allocator will be used
- * (av_buffer_alloc()).
- * @return newly created buffer pool on success, NULL on error.
- *)
- function av_buffer_pool_init(size: cint; alloc: TAlloc): PAVBufferRef;
- cdecl; external av__util;
+(**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ *)
- (**
- * Mark the pool as being available for freeing. It will actually be freed only
- * once all the allocated buffers associated with the pool are released. Thus it
- * is safe to call this function while some of the allocated buffers are still
- * in use.
- *
- * @param pool pointer to the pool to be freed. It will be set to NULL.
- * @see av_buffer_pool_can_uninit()
- *)
- procedure av_buffer_pool_uninit(pool: PPAVBufferPool);
- cdecl; external av__util;
+(**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ *)
+function av_buffer_pool_init(size: cint; alloc: TAlloc): PAVBufferRef;
+ cdecl; external av__util;
- (**
- * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
- * This function may be called simultaneously from multiple threads.
- *
- * @return a reference to the new buffer on success, NULL on error.
- *)
- function av_buffer_pool_get(pool: PAVBufferPool): PAVBufferRef;
- cdecl; external av__util;
+(**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ *)
+procedure av_buffer_pool_uninit(pool: PPAVBufferPool);
+ cdecl; external av__util;
- (**
- * @{
- *)
+(**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ *)
+function av_buffer_pool_get(pool: PAVBufferPool): PAVBufferRef;
+ cdecl; external av__util;
diff --git a/src/lib/ffmpeg-2.1/libavutil/frame.pas b/src/lib/ffmpeg-2.1/libavutil/frame.pas
index 4a7150cf..725ebce1 100644
--- a/src/lib/ffmpeg-2.1/libavutil/frame.pas
+++ b/src/lib/ffmpeg-2.1/libavutil/frame.pas
@@ -57,7 +57,7 @@ type
TAVFrameSideDataType = (
(**
* The data is the AVPanScan struct defined in libavcodec.
- *)
+ *)
AV_FRAME_DATA_PANSCAN
);
@@ -69,35 +69,35 @@ type
metadata: TAVDictionary;
end; {TAVFrameSideData}
- (**
- * This structure describes decoded (raw) audio or video data.
- *
- * AVFrame must be allocated using av_frame_alloc(). Note that this only
- * allocates the AVFrame itself, the buffers for the data must be managed
- * through other means (see below).
- * AVFrame must be freed with av_frame_free().
- *
- * AVFrame is typically allocated once and then reused multiple times to hold
- * different data (e.g. a single AVFrame to hold frames received from a
- * decoder). In such a case, av_frame_unref() will free any references held by
- * the frame and reset it to its original clean state before it
- * is reused again.
- *
- * The data described by an AVFrame is usually reference counted through the
- * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
- * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
- * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
- * every single data plane must be contained in one of the buffers in
- * AVFrame.buf or AVFrame.extended_buf.
- * There may be a single buffer for all the data, or one separate buffer for
- * each plane, or anything in between.
- *
- * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
- * to the end with a minor bump.
- * Similarly fields that are marked as to be only accessed by
- * av_opt_ptr() can be reordered. This allows 2 forks to add fields
- * without breaking compatibility with each other.
- *)
+(**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ * Similarly fields that are marked as to be only accessed by
+ * av_opt_ptr() can be reordered. This allows 2 forks to add fields
+ * without breaking compatibility with each other.
+*)
PPAVFrame = ^PAVFrame;
PAVFrame = ^TAVFrame;
TAVFrame = record
@@ -109,7 +109,7 @@ type
* see avcodec_align_dimensions2(). Some filters and swscale can read
* up to 16 bytes beyond the planes, if these filters are to be used,
* then 16 extra bytes must be allocated.
- *)
+ *)
data: array [0..AV_NUM_DATA_POINTERS - 1] of pbyte;
(**
@@ -126,7 +126,7 @@ type
*
* @note The linesize may be larger than the size of usable data -- there
* may be extra padding present for performance reasons.
- *)
+ *)
linesize: array [0..AV_NUM_DATA_POINTERS - 1] of cint;
(**
@@ -146,7 +146,7 @@ type
*
* encoding: set by user
* decoding: set by AVCodecContext.get_buffer()
- *)
+ *)
extended_data: ^pbyte;
(**
@@ -159,7 +159,7 @@ type
* number of audio samples (per channel) described by this frame
* - encoding: Set by user
* - decoding: Set by libavcodec
- *)
+ *)
nb_samples: cint;
(**
@@ -168,21 +168,21 @@ type
* enum AVSampleFormat for audio)
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
format: cint;
(**
* 1 -> keyframe, 0-> not
* - encoding: Set by libavcodec.
* - decoding: Set by libavcodec.
- *)
+ *)
key_frame: cint;
(**
* Picture type of the frame
* - encoding: Set by libavcodec. for coded_picture (and set by user for input).
* - decoding: Set by libavcodec.
- *)
+ *)
pict_type: TAVPictureType;
{$IFDEF FF_API_AVFRAME_LAVC}
@@ -191,7 +191,7 @@ type
* This isn't used by libavcodec unless the default get/release_buffer() is used.
* - encoding:
* - decoding:
- *)
+ *)
base: array [0..AV_NUM_DATA_POINTERS - 1] of pbyte; {deprecated}
{$ENDIF}
@@ -199,7 +199,7 @@ type
* sample aspect ratio for the video frame, 0/1 if unknown/unspecified
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
sample_aspect_ratio: TAVRational;
(**
@@ -207,42 +207,42 @@ type
* If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
* - encoding: MUST be set by user.
* - decoding: Set by libavcodec.
- *)
+ *)
pts: cint64;
(**
* pts copied from the AVPacket that was decoded to produce this frame
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
pkt_pts: cint64;
(**
* dts copied from the AVPacket that triggered returning this frame
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
pkt_dts: cint64;
(**
* picture number in bitstream order
* - encoding: set by
* - decoding: Set by libavcodec.
- *)
+ *)
coded_picture_number: cint;
(**
* picture number in display order
* - encoding: set by
* - decoding: Set by libavcodec.
- *)
+ *)
display_picture_number: cint;
(**
* quality (between 1 (good) and FF_LAMBDA_MAX (bad))
* - encoding: Set by libavcodec. for coded_picture (and set by user for input).
* - decoding: Set by libavcodec.
- *)
+ *)
quality: cint;
{$IFDEF FF_API_AVFRAME_LAVC}
@@ -250,19 +250,19 @@ type
(**
* QP table
- *)
+ *)
qscale_table: pbyte; {deprecated}
(**
* QP store stride
- *)
+ *)
qstride: cint; {deprecated}
qscale_type: cint; {deprecated}
(**
* mbskip_table[mb]>=1 if MB didn't change
* stride= mb_width = (width+15)>>4
- *)
+ *)
mbskip_table: pbyte; {deprecated}
(**
@@ -274,24 +274,24 @@ type
* int mv_stride= (mb_width << mv_sample_log2) + 1;
* motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
* @endcode
- *)
+ *)
motion_val: array [0..1] of pointer; {deprecated}
(**
* macroblock type table
* mb_type_base + mb_width + 2
- *)
+ *)
mb_type: PCuint; {deprecated}
(**
* DCT coefficients
- *)
+ *)
dct_coeff: PsmallInt; {deprecated}
(**
* motion reference frame index
* the order in which these are stored can depend on the codec.
- *)
+ *)
ref_index: array [0..1] of pbyte; {deprecated}
{$ENDIF}
@@ -299,14 +299,14 @@ type
* for some private data of the user
* - encoding: unused
* - decoding: Set by user.
- *)
+ *)
opaque: pointer;
(**
* error
* - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
* - decoding: unused
- *)
+ *)
error: array [0..AV_NUM_DATA_POINTERS - 1] of cuint64;
{$IFDEF FF_API_AVFRAME_LAVC}
@@ -318,35 +318,35 @@ type
* extra_delay = repeat_pict / (2*fps)
* - encoding: unused
* - decoding: Set by libavcodec.
- *)
+ *)
repeat_pict: cint;
(**
* The content of the picture is interlaced.
* - encoding: Set by user.
* - decoding: Set by libavcodec. (default 0)
- *)
+ *)
interlaced_frame: cint;
(**
* If the content is interlaced, is top field displayed first.
* - encoding: Set by user.
* - decoding: Set by libavcodec.
- *)
+ *)
top_field_first: cint;
(**
* Tell user application that palette has changed from previous frame.
* - encoding: ??? (no palette-enabled encoder yet)
* - decoding: Set by libavcodec. (default 0).
- *)
+ *)
palette_has_changed: cint;
{$IFDEF FF_API_AVFRAME_LAVC}
buffer_hints: cint; {deprecated}
(**
* Pan scan.
- *)
+ *)
pan_scan: PAVPanScan; {deprecated}
{$ENDIF}
@@ -360,13 +360,13 @@ type
* @deprecated in favor of pkt_pts
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
reordered_opaque: cint64;
{$IFDEF FF_API_AVFRAME_LAVC}
(**
* @deprecated this field is unused
- *)
+ *)
hwaccel_picture_private: pointer; {deprecated}
owner: PAVCodecContext; {deprecated}
thread_opaque: pointer; {deprecated}
@@ -374,7 +374,7 @@ type
(**
* log2 of the size of the block which a single vector in motion_val represents:
* (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
- *)
+ *)
motion_subsample_log2: cuint8; {deprecated}
{$ENDIF}
@@ -403,7 +403,7 @@ type
* AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
* this array. Then the extra AVBufferRef pointers are stored in the
* extended_buf array.
- *)
+ *)
buf: array [0..AV_NUM_DATA_POINTERS - 1] of PAVBufferRef;
(**
@@ -417,7 +417,7 @@ type
*
* This array is always allocated using av_malloc() by whoever constructs
* the frame. It is freed in av_frame_unref().
- *)
+ *)
extended_buf: PPAVBufferRef;
(**
@@ -434,7 +434,7 @@ type
* av_frame_get_best_effort_timestamp(frame)
* - encoding: unused
* - decoding: set by libavcodec, read by user.
- *)
+ *)
best_effort_timestamp: cint64;
(**
@@ -443,7 +443,7 @@ type
* av_frame_get_pkt_pos(frame)
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
pkt_pos: cint64;
(**
@@ -453,7 +453,7 @@ type
* av_frame_get_pkt_duration(frame)
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
pkt_duration: cint64;
(**
@@ -462,7 +462,7 @@ type
* av_frame_get_metadata(frame)
* - encoding: Set by user.
* - decoding: Set by libavcodec.
- *)
+ *)
metadata: PAVDictionary;
(**
@@ -473,7 +473,7 @@ type
* av_frame_get_decode_error_flags(frame)
* - encoding: unused
* - decoding: set by libavcodec, read by user.
- *)
+ *)
decode_error_flags: cint;
(**
@@ -482,7 +482,7 @@ type
* av_frame_get_channels(frame)
* - encoding: unused
* - decoding: Read by user.
- *)
+ *)
channels: cint;
(**
@@ -492,7 +492,7 @@ type
* It is set to a negative value if unknown.
* - encoding: unused
* - decoding: set by libavcodec, read by user.
- *)
+ *)
pkt_size: cint;
(**
@@ -501,7 +501,7 @@ type
* av_frame_set_colorspace().
* - encoding: Set by user
* - decoding: Set by libavcodec
- *)
+ *)
colorspace: TAVColorSpace;
(**
@@ -510,224 +510,224 @@ type
* av_frame_set_color_range().
* - encoding: Set by user
* - decoding: Set by libavcodec
- *)
+ *)
color_range: TAVColorRange;
(**
* Not to be accessed directly from outside libavutil
- *)
+ *)
qp_table_buf: PAVBufferRef;
end; {TAVFrame}
- (**
- * Accessors for some AVFrame fields.
- * The position of these field in the structure is not part of the ABI,
- * they should not be accessed directly outside libavcodec.
- *)
- function av_frame_get_best_effort_timestamp(frame: {const} PAVFrame): cint64;
- cdecl; external av__codec; overload;
- procedure av_frame_set_best_effort_timestamp(frame: PAVFrame; val: cint64);
- cdecl; external av__codec; overload;
- function av_frame_get_pkt_duration (frame: {const} PAVFrame): cint64;
- cdecl; external av__codec; overload;
- procedure av_frame_get_pkt_duration (frame: PAVFrame; val: cint64);
- cdecl; external av__codec; overload;
- function av_frame_get_pkt_pos (frame: {const} PAVFrame): cint64;
- cdecl; external av__codec; overload;
- procedure av_frame_get_pkt_pos (frame: PAVFrame; val: cint64);
- cdecl; external av__codec; overload;
- function av_frame_get_channel_layout (frame: {const} PAVFrame): cint64;
- cdecl; external av__codec; overload;
- procedure av_frame_get_channel_layout (frame: PAVFrame; val: cint64);
- cdecl; external av__codec; overload;
- function av_frame_get_channels (frame: {const} PAVFrame): cint;
- cdecl; external av__codec;
- procedure av_frame_set_channels (frame: PAVFrame; val: cint);
- cdecl; external av__codec;
- function av_frame_get_sample_rate (frame: {const} PAVFrame): cint;
- cdecl; external av__codec;
- procedure av_frame_set_sample_rate (frame: PAVFrame; val: cint);
- cdecl; external av__codec;
- function av_frame_get_metadata (frame: {const} PAVFrame): PAVDictionary;
- cdecl; external av__codec;
- procedure av_frame_set_metadata (frame: PAVFrame; val: PAVDictionary);
- cdecl; external av__codec;
- function av_frame_get_decode_error_flags (frame: {const} PAVFrame): cint;
- cdecl; external av__codec;
- procedure av_frame_set_decode_error_flags (frame: PAVFrame; val: cint);
- cdecl; external av__codec;
- function av_frame_get_pkt_size (frame: {const} PAVFrame): cint;
- cdecl; external av__codec;
- procedure av_frame_set_pkt_size (frame: PAVFrame; val: cint);
- cdecl; external av__codec;
- function avpriv_frame_get_metadatap(frame: PAVFrame): PPAVDictionary;
- cdecl; external av__codec;
- function av_frame_get_qp_table(f: PAVFrame; stride: pcint; type_: pcint): PByte;
- cdecl; external av__codec;
- function av_frame_set_qp_table(f: PAVFrame; buf: PAVBufferRef; stride: cint; type_: cint): cint;
- cdecl; external av__codec;
- function av_frame_get_colorspace(frame: {const} PAVFrame): TAVColorSpace;
- cdecl; external av__codec;
- procedure av_frame_set_colorspace(frame: PAVFrame; val: TAVColorSpace);
- cdecl; external av__codec;
- procedure av_frame_set_color_range(frame: PAVFrame; val: TAVColorSpace);
- cdecl; external av__codec;
-
- (**
- * Get the name of a colorspace.
- * @return a static string identifying the colorspace; can be NULL.
- *)
- function av_get_colorspace_name(val: TAVColorSpace): PAnsiChar;
- cdecl; external av__codec;
-
- (**
- * Allocate an AVFrame and set its fields to default values. The resulting
- * struct must be freed using av_frame_free().
- *
- * @return An AVFrame filled with default values or NULL on failure.
- *
- * @note this only allocates the AVFrame itself, not the data buffers. Those
- * must be allocated through other means, e.g. with av_frame_get_buffer() or
- * manually.
- *)
- function av_frame_alloc(): PAVFrame;
- cdecl; external av__codec;
-
- (**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data. If the frame is reference counted, it will be
- * unreferenced first.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- *)
- procedure av_frame_free(frame: PPAVFrame);
- cdecl; external av__codec;
-
- (**
- * Setup a new reference to the data described by a given frame.
- *
- * Copy frame properties from src to dst and create a new reference for each
- * AVBufferRef from src.
- *
- * If src is not reference counted, new buffers are allocated and the data is
- * copied.
- *
- * @return 0 on success, a negative AVERROR on error
- *)
- function av_frame_ref(dst: PAVFrame; src: PAVFrame): cint;
- cdecl; external av__codec;
-
- (**
- * Create a new frame that references the same data as src.
- *
- * This is a shortcut for av_frame_alloc()+av_frame_ref().
- *
- * @return newly created AVFrame on success, NULL on error.
- *)
- function av_frame_clone(src: PAVFrame): PAVFrame;
- cdecl; external av__codec;
-
- (**
- * Unreference all the buffers referenced by frame and reset the frame fields.
- *)
- procedure av_frame_unref(frame: PAVFrame);
- cdecl; external av__codec;
-
- (**
- * Move everythnig contained in src to dst and reset src.
- *)
- procedure av_frame_move_ref(dst, src: PAVFrame);
- cdecl; external av__codec;
-
- (**
- * Allocate new buffer(s) for audio or video data.
- *
- * The following fields must be set on frame before calling this function:
- * - format (pixel format for video, sample format for audio)
- * - width and height for video
- * - nb_samples and channel_layout for audio
- *
- * This function will fill AVFrame.data and AVFrame.buf arrays and, if
- * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
- * For planar formats, one buffer will be allocated for each plane.
- *
- * @param frame frame in which to store the new buffers.
- * @param align required buffer size alignment
- *
- * @return 0 on success, a negative AVERROR on error.
- *)
- function av_frame_get_buffer(frame: PAVFrame; align: cint): cint;
- cdecl; external av__codec;
-
- (**
- * Check if the frame data is writable.
- *
- * @return A positive value if the frame data is writable (which is true if and
- * only if each of the underlying buffers has only one reference, namely the one
- * stored in this frame). Return 0 otherwise.
- *
- * If 1 is returned the answer is valid until av_buffer_ref() is called on any
- * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
- *
- * @see av_frame_make_writable(), av_buffer_is_writable()
- *)
- function av_frame_is_writable(frame: PAVFrame): cint;
- cdecl; external av__codec;
-
- (**
- * Ensure that the frame data is writable, avoiding data copy if possible.
- *
- * Do nothing if the frame is writable, allocate new buffers and copy the data
- * if it is not.
- *
- * @return 0 on success, a negative AVERROR on error.
- *
- * @see av_frame_is_writable(), av_buffer_is_writable(),
- * av_buffer_make_writable()
- *)
- function av_frame_make_writable(frame: PAVFrame): cint;
- cdecl; external av__codec;
-
- (**
- * Copy only "metadata" fields from src to dst.
- *
- * Metadata for the purpose of this function are those fields that do not affect
- * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
- * aspect ratio (for video), but not width/height or channel layout.
- * Side data is also copied.
- *)
- function av_frame_copy_props(dst: PAVFrame; src: {const} PAVFrame): cint;
- cdecl; external av__codec;
-
- (**
- * Get the buffer reference a given data plane is stored in.
- *
- * @param plane index of the data plane of interest in frame->extended_data.
- *
- * @return the buffer reference that contains the plane or NULL if the input
- * frame is not valid.
- *)
- function av_frame_get_plane_buffer(frame: PAVFrame; plane: cint): PAVBufferRef;
- cdecl; external av__codec;
-
- (**
- * Add a new side data to a frame.
- *
- * @param frame a frame to which the side data should be added
- * @param type type of the added side data
- * @param size size of the side data
- *
- * @return newly added side data on success, NULL on error
- *)
- function av_frame_new_side_data(frame: PAVFrame;
- type_: TAVFrameSideDataType;
- size: cint): PAVFrameSideData;
- cdecl; external av__codec;
-
- (**
- * @return a pointer to the side data of a given type on success, NULL if there
- * is no side data with such type in this frame.
- *)
- function av_frame_get_side_data(frame: {const} PAVFrame; type_: TAVFrameSideDataType): PAVFrameSideData;
- cdecl; external av__codec;
+(**
+ * Accessors for some AVFrame fields.
+ * The position of these field in the structure is not part of the ABI,
+ * they should not be accessed directly outside libavcodec.
+ *)
+function av_frame_get_best_effort_timestamp(frame: {const} PAVFrame): cint64;
+ cdecl; external av__codec; overload;
+procedure av_frame_set_best_effort_timestamp(frame: PAVFrame; val: cint64);
+ cdecl; external av__codec; overload;
+function av_frame_get_pkt_duration (frame: {const} PAVFrame): cint64;
+ cdecl; external av__codec; overload;
+procedure av_frame_get_pkt_duration (frame: PAVFrame; val: cint64);
+ cdecl; external av__codec; overload;
+function av_frame_get_pkt_pos (frame: {const} PAVFrame): cint64;
+ cdecl; external av__codec; overload;
+procedure av_frame_get_pkt_pos (frame: PAVFrame; val: cint64);
+ cdecl; external av__codec; overload;
+function av_frame_get_channel_layout (frame: {const} PAVFrame): cint64;
+ cdecl; external av__codec; overload;
+procedure av_frame_get_channel_layout (frame: PAVFrame; val: cint64);
+ cdecl; external av__codec; overload;
+function av_frame_get_channels (frame: {const} PAVFrame): cint;
+ cdecl; external av__codec;
+procedure av_frame_set_channels (frame: PAVFrame; val: cint);
+ cdecl; external av__codec;
+function av_frame_get_sample_rate (frame: {const} PAVFrame): cint;
+ cdecl; external av__codec;
+procedure av_frame_set_sample_rate (frame: PAVFrame; val: cint);
+ cdecl; external av__codec;
+function av_frame_get_metadata (frame: {const} PAVFrame): PAVDictionary;
+ cdecl; external av__codec;
+procedure av_frame_set_metadata (frame: PAVFrame; val: PAVDictionary);
+ cdecl; external av__codec;
+function av_frame_get_decode_error_flags (frame: {const} PAVFrame): cint;
+ cdecl; external av__codec;
+procedure av_frame_set_decode_error_flags (frame: PAVFrame; val: cint);
+ cdecl; external av__codec;
+function av_frame_get_pkt_size (frame: {const} PAVFrame): cint;
+ cdecl; external av__codec;
+procedure av_frame_set_pkt_size (frame: PAVFrame; val: cint);
+ cdecl; external av__codec;
+function avpriv_frame_get_metadatap(frame: PAVFrame): PPAVDictionary;
+ cdecl; external av__codec;
+function av_frame_get_qp_table(f: PAVFrame; stride: pcint; type_: pcint): PByte;
+ cdecl; external av__codec;
+function av_frame_set_qp_table(f: PAVFrame; buf: PAVBufferRef; stride: cint; type_: cint): cint;
+ cdecl; external av__codec;
+function av_frame_get_colorspace(frame: {const} PAVFrame): TAVColorSpace;
+ cdecl; external av__codec;
+procedure av_frame_set_colorspace(frame: PAVFrame; val: TAVColorSpace);
+ cdecl; external av__codec;
+procedure av_frame_set_color_range(frame: PAVFrame; val: TAVColorSpace);
+ cdecl; external av__codec;
+
+(**
+ * Get the name of a colorspace.
+ * @return a static string identifying the colorspace; can be NULL.
+ *)
+function av_get_colorspace_name(val: TAVColorSpace): PAnsiChar;
+ cdecl; external av__codec;
+
+(**
+ * Allocate an AVFrame and set its fields to default values. The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ *)
+function av_frame_alloc(): PAVFrame;
+ cdecl; external av__codec;
+
+(**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ *)
+procedure av_frame_free(frame: PPAVFrame);
+ cdecl; external av__codec;
+
+(**
+ * Setup a new reference to the data described by a given frame.
+ *
+ * Copy frame properties from src to dst and create a new reference for each
+ * AVBufferRef from src.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ *)
+function av_frame_ref(dst: PAVFrame; src: PAVFrame): cint;
+ cdecl; external av__codec;
+
+(**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ *)
+function av_frame_clone(src: PAVFrame): PAVFrame;
+ cdecl; external av__codec;
+
+(**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ *)
+procedure av_frame_unref(frame: PAVFrame);
+ cdecl; external av__codec;
+
+(**
+ * Move everythnig contained in src to dst and reset src.
+ *)
+procedure av_frame_move_ref(dst, src: PAVFrame);
+ cdecl; external av__codec;
+
+(**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *)
+function av_frame_get_buffer(frame: PAVFrame; align: cint): cint;
+ cdecl; external av__codec;
+
+(**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ *)
+function av_frame_is_writable(frame: PAVFrame): cint;
+ cdecl; external av__codec;
+
+(**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ *)
+function av_frame_make_writable(frame: PAVFrame): cint;
+ cdecl; external av__codec;
+
+(**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers. E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ *)
+function av_frame_copy_props(dst: PAVFrame; src: {const} PAVFrame): cint;
+ cdecl; external av__codec;
+
+(**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ *)
+function av_frame_get_plane_buffer(frame: PAVFrame; plane: cint): PAVBufferRef;
+ cdecl; external av__codec;
+
+(**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ *)
+function av_frame_new_side_data(frame: PAVFrame;
+ type_: TAVFrameSideDataType;
+ size: cint): PAVFrameSideData;
+ cdecl; external av__codec;
+
+(**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ *)
+function av_frame_get_side_data(frame: {const} PAVFrame; type_: TAVFrameSideDataType): PAVFrameSideData;
+ cdecl; external av__codec;