lavc: Drop deprecated codec flags
Deprecated between 04/2014 - 05/2015.
This commit is contained in:
Vittorio Giovara
parent
302554835e
commit
bb45d11282
|
|
@ -657,18 +657,6 @@ typedef struct AVCodecDescriptor {
|
|||
*/
|
||||
#define AV_INPUT_BUFFER_MIN_SIZE 16384
|
||||
|
||||
#if FF_API_WITHOUT_PREFIX
|
||||
/**
|
||||
* @deprecated use AV_INPUT_BUFFER_PADDING_SIZE instead
|
||||
*/
|
||||
#define FF_INPUT_BUFFER_PADDING_SIZE 8
|
||||
|
||||
/**
|
||||
* @deprecated use AV_INPUT_BUFFER_MIN_SIZE instead
|
||||
*/
|
||||
#define FF_MIN_BUFFER_SIZE 16384
|
||||
#endif /* FF_API_WITHOUT_PREFIX */
|
||||
|
||||
/**
|
||||
* @ingroup lavc_encoding
|
||||
* motion estimation type.
|
||||
|
|
@ -914,152 +902,6 @@ typedef struct RcOverride{
|
|||
*/
|
||||
#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
|
||||
|
||||
#if FF_API_WITHOUT_PREFIX
|
||||
/**
|
||||
* Allow decoders to produce frames with data planes that are not aligned
|
||||
* to CPU requirements (e.g. due to cropping).
|
||||
*/
|
||||
#define CODEC_FLAG_UNALIGNED 0x0001
|
||||
#define CODEC_FLAG_QSCALE 0x0002 ///< Use fixed qscale.
|
||||
#define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed / advanced prediction for H.263.
|
||||
#define CODEC_FLAG_OUTPUT_CORRUPT 0x0008 ///< Output even those frames that might be corrupted
|
||||
#define CODEC_FLAG_QPEL 0x0010 ///< Use qpel MC.
|
||||
#if FF_API_GMC
|
||||
/**
|
||||
* @deprecated use the "gmc" private option of the libxvid encoder
|
||||
*/
|
||||
#define CODEC_FLAG_GMC 0x0020 ///< Use GMC.
|
||||
#endif
|
||||
#if FF_API_MV0
|
||||
/**
|
||||
* @deprecated use the flag "mv0" in the "mpv_flags" private option of the
|
||||
* mpegvideo encoders
|
||||
*/
|
||||
#define CODEC_FLAG_MV0 0x0040
|
||||
#endif
|
||||
#if FF_API_INPUT_PRESERVED
|
||||
/**
|
||||
* @deprecated passing reference-counted frames to the encoders replaces this
|
||||
* flag
|
||||
*/
|
||||
#define CODEC_FLAG_INPUT_PRESERVED 0x0100
|
||||
#endif
|
||||
#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
|
||||
#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
|
||||
#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
|
||||
#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
|
||||
#define CODEC_FLAG_TRUNCATED 0x00010000 /** Input bitstream might be truncated at a random
|
||||
location instead of only at frame boundaries. */
|
||||
#if FF_API_NORMALIZE_AQP
|
||||
/**
|
||||
* @deprecated use the flag "naq" in the "mpv_flags" private option of the
|
||||
* mpegvideo encoders
|
||||
*/
|
||||
#define CODEC_FLAG_NORMALIZE_AQP 0x00020000
|
||||
#endif
|
||||
#define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
|
||||
#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_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
|
||||
/* 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_LOOP_FILTER 0x00000800 ///< loop filter
|
||||
#define CODEC_FLAG_INTERLACED_ME 0x20000000 ///< interlaced motion estimation
|
||||
#define CODEC_FLAG_CLOSED_GOP 0x80000000
|
||||
#define CODEC_FLAG2_FAST 0x00000001 ///< Allow non spec compliant speedup tricks.
|
||||
#define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding.
|
||||
#define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata.
|
||||
#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS.
|
||||
|
||||
#define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
|
||||
|
||||
/* Unsupported options :
|
||||
* Syntax Arithmetic coding (SAC)
|
||||
* Reference Picture Selection
|
||||
* Independent Segment Decoding */
|
||||
/* /Fx */
|
||||
/* codec capabilities */
|
||||
|
||||
#define CODEC_CAP_DRAW_HORIZ_BAND 0x0001 ///< Decoder can use draw_horiz_band callback.
|
||||
/**
|
||||
* Codec uses get_buffer() for allocating buffers and supports custom allocators.
|
||||
* If not set, it might not use get_buffer() at all or use operations that
|
||||
* assume the buffer was allocated by avcodec_default_get_buffer.
|
||||
*/
|
||||
#define CODEC_CAP_DR1 0x0002
|
||||
#define CODEC_CAP_TRUNCATED 0x0008
|
||||
/**
|
||||
* Encoder or decoder requires flushing with NULL input at the end in order to
|
||||
* give the complete and correct output.
|
||||
*
|
||||
* NOTE: If this flag is not set, the codec is guaranteed to never be fed with
|
||||
* with NULL data. The user can still send NULL data to the public encode
|
||||
* or decode function, but libavcodec will not pass it along to the codec
|
||||
* unless this flag is set.
|
||||
*
|
||||
* Decoders:
|
||||
* The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
|
||||
* avpkt->size=0 at the end to get the delayed data until the decoder no longer
|
||||
* returns frames.
|
||||
*
|
||||
* Encoders:
|
||||
* The encoder needs to be fed with NULL data at the end of encoding until the
|
||||
* encoder no longer returns data.
|
||||
*
|
||||
* NOTE: For encoders implementing the AVCodec.encode2() function, setting this
|
||||
* flag also means that the encoder must set the pts and duration for
|
||||
* each output packet. If this flag is not set, the pts and duration will
|
||||
* be determined by libavcodec from the input frame.
|
||||
*/
|
||||
#define CODEC_CAP_DELAY 0x0020
|
||||
/**
|
||||
* Codec can be fed a final frame with a smaller size.
|
||||
* This can be used to prevent truncation of the last audio samples.
|
||||
*/
|
||||
#define CODEC_CAP_SMALL_LAST_FRAME 0x0040
|
||||
/**
|
||||
* Codec can output multiple frames per AVPacket
|
||||
* Normally demuxers return one frame at a time, demuxers which do not do
|
||||
* 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
|
||||
* bitstream that cannot be split into frames without timeconsuming
|
||||
* operations like full decoding. Demuxers carrying such bitstreams thus
|
||||
* may return multiple frames in a packet. This has many disadvantages like
|
||||
* prohibiting stream copy in many cases thus it should only be considered
|
||||
* as a last resort.
|
||||
*/
|
||||
#define CODEC_CAP_SUBFRAMES 0x0100
|
||||
/**
|
||||
* Codec is experimental and is thus avoided in favor of non experimental
|
||||
* encoders
|
||||
*/
|
||||
#define CODEC_CAP_EXPERIMENTAL 0x0200
|
||||
/**
|
||||
* Codec should fill in channel configuration and samplerate instead of container
|
||||
*/
|
||||
#define CODEC_CAP_CHANNEL_CONF 0x0400
|
||||
/**
|
||||
* Codec supports frame-level multithreading.
|
||||
*/
|
||||
#define CODEC_CAP_FRAME_THREADS 0x1000
|
||||
/**
|
||||
* Codec supports slice-based (or partition-based) multithreading.
|
||||
*/
|
||||
#define CODEC_CAP_SLICE_THREADS 0x2000
|
||||
/**
|
||||
* Codec supports changed parameters at any point.
|
||||
*/
|
||||
#define CODEC_CAP_PARAM_CHANGE 0x4000
|
||||
/**
|
||||
* Codec supports avctx->thread_count == 0 (auto).
|
||||
*/
|
||||
#define CODEC_CAP_AUTO_THREADS 0x8000
|
||||
/**
|
||||
* Audio encoder supports receiving a different number of samples in each call.
|
||||
*/
|
||||
#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x10000
|
||||
#endif /* FF_API_WITHOUT_PREFIX */
|
||||
|
||||
/**
|
||||
* Pan Scan area.
|
||||
* This specifies the area which should be displayed.
|
||||
|
|
|
|||
|
|
@ -475,12 +475,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||
break;
|
||||
}
|
||||
|
||||
/* Bring in VOL flags from avconv command-line */
|
||||
#if FF_API_GMC
|
||||
if (avctx->flags & CODEC_FLAG_GMC)
|
||||
x->gmc = 1;
|
||||
#endif
|
||||
|
||||
x->vol_flags = 0;
|
||||
if (x->gmc) {
|
||||
x->vol_flags |= XVID_VOL_GMC;
|
||||
|
|
|
|||
|
|
@ -874,20 +874,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||
if (ff_rate_control_init(s) < 0)
|
||||
return -1;
|
||||
|
||||
#if FF_API_NORMALIZE_AQP
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->flags & CODEC_FLAG_NORMALIZE_AQP)
|
||||
s->mpv_flags |= FF_MPV_FLAG_NAQ;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS;
|
||||
#endif
|
||||
|
||||
#if FF_API_MV0
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->flags & CODEC_FLAG_MV0)
|
||||
s->mpv_flags |= FF_MPV_FLAG_MV0;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
|
||||
#if FF_API_MPV_OPT
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->rc_qsquish != 0.0)
|
||||
|
|
|
|||
|
|
@ -50,23 +50,11 @@ static const AVOption avcodec_options[] = {
|
|||
{"qpel", "use 1/4-pel motion compensation", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QPEL }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
{"loop", "use loop filter", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOOP_FILTER }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
{"qscale", "use fixed qscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_QSCALE }, INT_MIN, INT_MAX, 0, "flags"},
|
||||
#if FF_API_GMC
|
||||
{"gmc", "use gmc", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_GMC }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
#endif
|
||||
#if FF_API_MV0
|
||||
{"mv0", "always try a mb with mv=<0,0>", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_MV0 }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
#endif
|
||||
#if FF_API_INPUT_PRESERVED
|
||||
{"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"},
|
||||
#endif
|
||||
{"pass1", "use internal 2-pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"},
|
||||
{"pass2", "use internal 2-pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"},
|
||||
{"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"},
|
||||
{"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
{"truncated", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_TRUNCATED }, INT_MIN, INT_MAX, 0, "flags"},
|
||||
#if FF_API_NORMALIZE_AQP
|
||||
{"naq", "normalize adaptive quantization", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG_NORMALIZE_AQP }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
#endif
|
||||
{"ildct", "use interlaced DCT", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_INTERLACED_DCT }, INT_MIN, INT_MAX, V|E, "flags"},
|
||||
{"low_delay", "force low delay", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_LOW_DELAY }, INT_MIN, INT_MAX, V|D|E, "flags"},
|
||||
{"global_header", "place global headers in extradata instead of every keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG_GLOBAL_HEADER }, INT_MIN, INT_MAX, V|A|E, "flags"},
|
||||
|
|
|
|||
|
|
@ -47,18 +47,6 @@
|
|||
* the public API and may change, break or disappear at any time.
|
||||
*/
|
||||
|
||||
#ifndef FF_API_INPUT_PRESERVED
|
||||
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_NORMALIZE_AQP
|
||||
#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_GMC
|
||||
#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_MV0
|
||||
#define FF_API_MV0 (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_CODEC_NAME
|
||||
#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
|
|
@ -89,9 +77,6 @@
|
|||
#ifndef FF_API_MOTION_EST
|
||||
#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_WITHOUT_PREFIX
|
||||
#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||
#endif
|
||||
#ifndef FF_API_SIDEDATA_ONLY_PKT
|
||||
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user