|
@@ -783,7 +783,7 @@ typedef struct RcOverride{
|
|
|
* Use only bitexact stuff (except (I)DCT).
|
|
* Use only bitexact stuff (except (I)DCT).
|
|
|
*/
|
|
*/
|
|
|
#define AV_CODEC_FLAG_BITEXACT (1 << 23)
|
|
#define AV_CODEC_FLAG_BITEXACT (1 << 23)
|
|
|
-/* Fx : Flag for h263+ extra options */
|
|
|
|
|
|
|
+/* Fx : Flag for H.263+ extra options */
|
|
|
/**
|
|
/**
|
|
|
* H.263 advanced intra coding / MPEG-4 AC prediction
|
|
* H.263 advanced intra coding / MPEG-4 AC prediction
|
|
|
*/
|
|
*/
|
|
@@ -869,7 +869,7 @@ typedef struct RcOverride{
|
|
|
* are connected to a parser to split what they return into proper frames.
|
|
* are connected to a parser to split what they return into proper frames.
|
|
|
* This flag is reserved to the very rare category of codecs which have a
|
|
* This flag is reserved to the very rare category of codecs which have a
|
|
|
* bitstream that cannot be split into frames without timeconsuming
|
|
* bitstream that cannot be split into frames without timeconsuming
|
|
|
- * operations like full decoding. Demuxers carring such bitstreams thus
|
|
|
|
|
|
|
+ * operations like full decoding. Demuxers carrying such bitstreams thus
|
|
|
* may return multiple frames in a packet. This has many disadvantages like
|
|
* may return multiple frames in a packet. This has many disadvantages like
|
|
|
* prohibiting stream copy in many cases thus it should only be considered
|
|
* prohibiting stream copy in many cases thus it should only be considered
|
|
|
* as a last resort.
|
|
* as a last resort.
|
|
@@ -959,7 +959,7 @@ typedef struct RcOverride{
|
|
|
#define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
|
|
#define CODEC_FLAG_LOW_DELAY 0x00080000 ///< Force low delay.
|
|
|
#define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe.
|
|
#define CODEC_FLAG_GLOBAL_HEADER 0x00400000 ///< Place global headers in extradata instead of every keyframe.
|
|
|
#define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
|
|
#define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
|
|
|
-/* Fx : Flag for h263+ extra options */
|
|
|
|
|
|
|
+/* Fx : Flag for H.263+ extra options */
|
|
|
#define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
|
|
#define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
|
|
|
#define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter
|
|
#define CODEC_FLAG_LOOP_FILTER 0x00000800 ///< loop filter
|
|
|
#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
|
|
#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
|
|
@@ -1031,7 +1031,7 @@ typedef struct RcOverride{
|
|
|
* are connected to a parser to split what they return into proper frames.
|
|
* are connected to a parser to split what they return into proper frames.
|
|
|
* This flag is reserved to the very rare category of codecs which have a
|
|
* This flag is reserved to the very rare category of codecs which have a
|
|
|
* bitstream that cannot be split into frames without timeconsuming
|
|
* bitstream that cannot be split into frames without timeconsuming
|
|
|
- * operations like full decoding. Demuxers carring such bitstreams thus
|
|
|
|
|
|
|
+ * operations like full decoding. Demuxers carrying such bitstreams thus
|
|
|
* may return multiple frames in a packet. This has many disadvantages like
|
|
* may return multiple frames in a packet. This has many disadvantages like
|
|
|
* prohibiting stream copy in many cases thus it should only be considered
|
|
* prohibiting stream copy in many cases thus it should only be considered
|
|
|
* as a last resort.
|
|
* as a last resort.
|
|
@@ -1097,7 +1097,7 @@ typedef struct RcOverride{
|
|
|
#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
|
|
#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
|
|
|
#define MB_TYPE_QUANT 0x00010000
|
|
#define MB_TYPE_QUANT 0x00010000
|
|
|
#define MB_TYPE_CBP 0x00020000
|
|
#define MB_TYPE_CBP 0x00020000
|
|
|
-//Note bits 24-31 are reserved for codec specific use (h264 ref0, mpeg1 0mv, ...)
|
|
|
|
|
|
|
+// Note bits 24-31 are reserved for codec specific use (H.264 ref0, MPEG-1 0mv, ...)
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1500,11 +1500,11 @@ typedef struct AVCodecContext {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* some codecs need / can use extradata like Huffman tables.
|
|
* some codecs need / can use extradata like Huffman tables.
|
|
|
- * mjpeg: Huffman tables
|
|
|
|
|
|
|
+ * MJPEG: Huffman tables
|
|
|
* rv10: additional flags
|
|
* rv10: additional flags
|
|
|
- * mpeg4: global headers (they can be in the bitstream or here)
|
|
|
|
|
|
|
+ * MPEG-4: global headers (they can be in the bitstream or here)
|
|
|
* The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
|
|
* The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
|
|
|
- * than extradata_size to avoid prolems if it is read with the bitstream reader.
|
|
|
|
|
|
|
+ * than extradata_size to avoid problems if it is read with the bitstream reader.
|
|
|
* The bytewise contents of extradata must not depend on the architecture or CPU endianness.
|
|
* The bytewise contents of extradata must not depend on the architecture or CPU endianness.
|
|
|
* - encoding: Set/allocated/freed by libavcodec.
|
|
* - encoding: Set/allocated/freed by libavcodec.
|
|
|
* - decoding: Set/allocated/freed by user.
|
|
* - decoding: Set/allocated/freed by user.
|
|
@@ -1557,7 +1557,7 @@ typedef struct AVCodecContext {
|
|
|
* picture width / height.
|
|
* picture width / height.
|
|
|
*
|
|
*
|
|
|
* @note Those fields may not match the values of the last
|
|
* @note Those fields may not match the values of the last
|
|
|
- * AVFrame outputted by avcodec_decode_video2 due frame
|
|
|
|
|
|
|
+ * AVFrame output by avcodec_decode_video2 due frame
|
|
|
* reordering.
|
|
* reordering.
|
|
|
*
|
|
*
|
|
|
* - encoding: MUST be set by user.
|
|
* - encoding: MUST be set by user.
|
|
@@ -1573,7 +1573,7 @@ typedef struct AVCodecContext {
|
|
|
* the decoded frame is cropped before being output.
|
|
* the decoded frame is cropped before being output.
|
|
|
*
|
|
*
|
|
|
* @note Those field may not match the value of the last
|
|
* @note Those field may not match the value of the last
|
|
|
- * AVFrame outputted by avcodec_receive_frame() due frame
|
|
|
|
|
|
|
+ * AVFrame output by avcodec_receive_frame() due frame
|
|
|
* reordering.
|
|
* reordering.
|
|
|
*
|
|
*
|
|
|
* - encoding: unused
|
|
* - encoding: unused
|
|
@@ -1597,10 +1597,10 @@ typedef struct AVCodecContext {
|
|
|
/**
|
|
/**
|
|
|
* Pixel format, see AV_PIX_FMT_xxx.
|
|
* Pixel format, see AV_PIX_FMT_xxx.
|
|
|
* May be set by the demuxer if known from headers.
|
|
* May be set by the demuxer if known from headers.
|
|
|
- * May be overriden by the decoder if it knows better.
|
|
|
|
|
|
|
+ * May be overridden by the decoder if it knows better.
|
|
|
*
|
|
*
|
|
|
* @note This field may not match the value of the last
|
|
* @note This field may not match the value of the last
|
|
|
- * AVFrame outputted by avcodec_receive_frame() due frame
|
|
|
|
|
|
|
+ * AVFrame output by avcodec_receive_frame() due frame
|
|
|
* reordering.
|
|
* reordering.
|
|
|
*
|
|
*
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
@@ -1710,8 +1710,8 @@ typedef struct AVCodecContext {
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * qscale factor between P and I-frames
|
|
|
|
|
- * If > 0 then the last p frame quantizer will be used (q= lastp_q*factor+offset).
|
|
|
|
|
|
|
+ * qscale factor between P- and I-frames
|
|
|
|
|
+ * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor + offset).
|
|
|
* If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
|
|
* If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
|
* - decoding: unused
|
|
* - decoding: unused
|
|
@@ -1921,7 +1921,7 @@ typedef struct AVCodecContext {
|
|
|
*/
|
|
*/
|
|
|
int slice_flags;
|
|
int slice_flags;
|
|
|
#define SLICE_FLAG_CODED_ORDER 0x0001 ///< draw_horiz_band() is called in coded order instead of display
|
|
#define SLICE_FLAG_CODED_ORDER 0x0001 ///< draw_horiz_band() is called in coded order instead of display
|
|
|
-#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG2 field pics)
|
|
|
|
|
|
|
+#define SLICE_FLAG_ALLOW_FIELD 0x0002 ///< allow draw_horiz_band() with field slices (MPEG-2 field pics)
|
|
|
#define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
|
|
#define SLICE_FLAG_ALLOW_PLANE 0x0004 ///< allow draw_horiz_band() with 1 component at a time (SVQ1)
|
|
|
|
|
|
|
|
#if FF_API_XVMC
|
|
#if FF_API_XVMC
|
|
@@ -2012,14 +2012,14 @@ typedef struct AVCodecContext {
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * minimum MB lagrange multipler
|
|
|
|
|
|
|
+ * minimum MB Lagrange multiplier
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
|
* - decoding: unused
|
|
* - decoding: unused
|
|
|
*/
|
|
*/
|
|
|
int mb_lmin;
|
|
int mb_lmin;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * maximum MB lagrange multipler
|
|
|
|
|
|
|
+ * maximum MB Lagrange multiplier
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
|
* - decoding: unused
|
|
* - decoding: unused
|
|
|
*/
|
|
*/
|
|
@@ -2238,7 +2238,7 @@ typedef struct AVCodecContext {
|
|
|
* to all data planes. data[] must hold as many pointers as it can.
|
|
* to all data planes. data[] must hold as many pointers as it can.
|
|
|
* extended_data must be allocated with av_malloc() and will be freed in
|
|
* extended_data must be allocated with av_malloc() and will be freed in
|
|
|
* av_frame_unref().
|
|
* av_frame_unref().
|
|
|
- * * otherwise exended_data must point to data
|
|
|
|
|
|
|
+ * * otherwise extended_data must point to data
|
|
|
* - buf[] must contain one or more pointers to AVBufferRef structures. Each of
|
|
* - buf[] must contain one or more pointers to AVBufferRef structures. Each of
|
|
|
* the frame's data and extended_data pointers must be contained in these. That
|
|
* the frame's data and extended_data pointers must be contained in these. That
|
|
|
* is, one AVBufferRef for each allocated chunk of memory, not necessarily one
|
|
* is, one AVBufferRef for each allocated chunk of memory, not necessarily one
|
|
@@ -2580,7 +2580,7 @@ typedef struct AVCodecContext {
|
|
|
#define FF_BUG_TRUNCATED 16384
|
|
#define FF_BUG_TRUNCATED 16384
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * strictly follow the standard (MPEG4, ...).
|
|
|
|
|
|
|
+ * strictly follow the standard (MPEG-4, ...).
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
|
* - decoding: Set by user.
|
|
* - decoding: Set by user.
|
|
|
* Setting this to STRICT or higher means the encoder and decoder will
|
|
* Setting this to STRICT or higher means the encoder and decoder will
|
|
@@ -2646,9 +2646,9 @@ typedef struct AVCodecContext {
|
|
|
*/
|
|
*/
|
|
|
attribute_deprecated
|
|
attribute_deprecated
|
|
|
int debug_mv;
|
|
int debug_mv;
|
|
|
-#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames
|
|
|
|
|
-#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames
|
|
|
|
|
-#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames
|
|
|
|
|
|
|
+#define FF_DEBUG_VIS_MV_P_FOR 0x00000001 // visualize forward predicted MVs of P-frames
|
|
|
|
|
+#define FF_DEBUG_VIS_MV_B_FOR 0x00000002 // visualize forward predicted MVs of B-frames
|
|
|
|
|
+#define FF_DEBUG_VIS_MV_B_BACK 0x00000004 // visualize backward predicted MVs of B-frames
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -2670,7 +2670,7 @@ typedef struct AVCodecContext {
|
|
|
#define AV_EF_EXPLODE (1<<3)
|
|
#define AV_EF_EXPLODE (1<<3)
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * opaque 64bit number (generally a PTS) that will be reordered and
|
|
|
|
|
|
|
+ * opaque 64-bit number (generally a PTS) that will be reordered and
|
|
|
* output in AVFrame.reordered_opaque
|
|
* output in AVFrame.reordered_opaque
|
|
|
* - encoding: unused
|
|
* - encoding: unused
|
|
|
* - decoding: Set by user.
|
|
* - decoding: Set by user.
|
|
@@ -2855,7 +2855,7 @@ typedef struct AVCodecContext {
|
|
|
int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
|
|
int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count);
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * noise vs. sse weight for the nsse comparsion function
|
|
|
|
|
|
|
+ * noise vs. sse weight for the nsse comparison function
|
|
|
* - encoding: Set by user.
|
|
* - encoding: Set by user.
|
|
|
* - decoding: unused
|
|
* - decoding: unused
|
|
|
*/
|
|
*/
|
|
@@ -3426,7 +3426,7 @@ typedef struct AVSubtitleRect {
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 0 terminated ASS/SSA compatible event line.
|
|
* 0 terminated ASS/SSA compatible event line.
|
|
|
- * The pressentation of this is unaffected by the other values in this
|
|
|
|
|
|
|
+ * The presentation of this is unaffected by the other values in this
|
|
|
* struct.
|
|
* struct.
|
|
|
*/
|
|
*/
|
|
|
char *ass;
|
|
char *ass;
|
|
@@ -4153,7 +4153,7 @@ int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
|
|
|
* next call to this function or until closing or flushing the
|
|
* next call to this function or until closing or flushing the
|
|
|
* decoder. The caller may not write to it.
|
|
* decoder. The caller may not write to it.
|
|
|
*
|
|
*
|
|
|
- * @param[in] avpkt The input AVpacket containing the input buffer.
|
|
|
|
|
|
|
+ * @param[in] avpkt The input AVPacket containing the input buffer.
|
|
|
* You can create such packet with av_init_packet() and by then setting
|
|
* You can create such packet with av_init_packet() and by then setting
|
|
|
* data and size, some decoders might in addition need other fields like
|
|
* data and size, some decoders might in addition need other fields like
|
|
|
* flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
|
|
* flags&AV_PKT_FLAG_KEY. All decoders are designed to use the least
|
|
@@ -5172,7 +5172,7 @@ unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
|
|
|
* a pointer to an AVClass struct
|
|
* a pointer to an AVClass struct
|
|
|
* @param[in] feature string containing the name of the missing feature
|
|
* @param[in] feature string containing the name of the missing feature
|
|
|
* @param[in] want_sample indicates if samples are wanted which exhibit this feature.
|
|
* @param[in] want_sample indicates if samples are wanted which exhibit this feature.
|
|
|
- * If want_sample is non-zero, additional verbage will be added to the log
|
|
|
|
|
|
|
+ * If want_sample is non-zero, additional verbiage will be added to the log
|
|
|
* message which tells the user how to report samples to the development
|
|
* message which tells the user how to report samples to the development
|
|
|
* mailing list.
|
|
* mailing list.
|
|
|
* @deprecated Use avpriv_report_missing_feature() instead.
|
|
* @deprecated Use avpriv_report_missing_feature() instead.
|