Remove old FF_API_* features (#80)
* Clean up FF_API features Use (for avcodec): `git log -n1 -p -SFF_API_* -- libavcodec/version_major.h` to find the last change regarding the relevant FF_API feature. Removed all flags that are <4.0. Added comments for the remaining flags * Remove features gated behind old FF_API flags
This commit is contained in:
parent
9ecb233d50
commit
ef14631f71
@ -84,29 +84,18 @@ impl AVFeature {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static AVUTIL_FEATURES: &[AVFeature] = &[
|
static AVUTIL_FEATURES: &[AVFeature] = &[
|
||||||
AVFeature::new("OLD_AVOPTIONS"),
|
// before 5.0 (< v57)
|
||||||
AVFeature::new("PIX_FMT"),
|
|
||||||
AVFeature::new("CONTEXT_SIZE"),
|
|
||||||
AVFeature::new("PIX_FMT_DESC"),
|
|
||||||
AVFeature::new("AV_REVERSE"),
|
|
||||||
AVFeature::new("AUDIOCONVERT"),
|
|
||||||
AVFeature::new("CPU_FLAG_MMX2"),
|
|
||||||
AVFeature::new("LLS_PRIVATE"),
|
|
||||||
AVFeature::new("AVFRAME_LAVC"),
|
|
||||||
AVFeature::new("VDPAU"),
|
|
||||||
AVFeature::new("GET_CHANNEL_LAYOUT_COMPAT"),
|
|
||||||
AVFeature::new("XVMC"),
|
|
||||||
AVFeature::new("OPT_TYPE_METADATA"),
|
|
||||||
AVFeature::new("DLOG"),
|
|
||||||
AVFeature::new("HMAC"),
|
|
||||||
AVFeature::new("VAAPI"),
|
AVFeature::new("VAAPI"),
|
||||||
AVFeature::new("PKT_PTS"),
|
AVFeature::new("PKT_PTS"),
|
||||||
AVFeature::new("ERROR_FRAME"),
|
AVFeature::new("ERROR_FRAME"),
|
||||||
AVFeature::new("FRAME_QP"),
|
AVFeature::new("FRAME_QP"),
|
||||||
|
// before 6.0 (< v58)
|
||||||
AVFeature::new("D2STR"),
|
AVFeature::new("D2STR"),
|
||||||
AVFeature::new("DECLARE_ALIGNED"),
|
AVFeature::new("DECLARE_ALIGNED"),
|
||||||
AVFeature::new("COLORSPACE_NAME"),
|
AVFeature::new("COLORSPACE_NAME"),
|
||||||
AVFeature::new("AV_MALLOCZ_ARRAY"),
|
AVFeature::new("AV_MALLOCZ_ARRAY"),
|
||||||
|
// before 7.0 (< v59)
|
||||||
|
AVFeature::new("XVMC"),
|
||||||
AVFeature::new("FIFO_PEEK2"),
|
AVFeature::new("FIFO_PEEK2"),
|
||||||
AVFeature::new("FIFO_OLD_API"),
|
AVFeature::new("FIFO_OLD_API"),
|
||||||
AVFeature::new("OLD_CHANNEL_LAYOUT"),
|
AVFeature::new("OLD_CHANNEL_LAYOUT"),
|
||||||
@ -114,6 +103,7 @@ static AVUTIL_FEATURES: &[AVFeature] = &[
|
|||||||
AVFeature::new("PKT_DURATION"),
|
AVFeature::new("PKT_DURATION"),
|
||||||
AVFeature::new("REORDERED_OPAQUE"),
|
AVFeature::new("REORDERED_OPAQUE"),
|
||||||
AVFeature::new("FRAME_PICTURE_NUMBER"),
|
AVFeature::new("FRAME_PICTURE_NUMBER"),
|
||||||
|
// before 8.0 (< v60)
|
||||||
AVFeature::new("HDR_VIVID_THREE_SPLINE"),
|
AVFeature::new("HDR_VIVID_THREE_SPLINE"),
|
||||||
AVFeature::new("FRAME_PKT"),
|
AVFeature::new("FRAME_PKT"),
|
||||||
AVFeature::new("INTERLACED_FRAME"),
|
AVFeature::new("INTERLACED_FRAME"),
|
||||||
@ -127,58 +117,9 @@ static AVUTIL_FEATURES: &[AVFeature] = &[
|
|||||||
];
|
];
|
||||||
|
|
||||||
static AVCODEC_FEATURES: &[AVFeature] = &[
|
static AVCODEC_FEATURES: &[AVFeature] = &[
|
||||||
AVFeature::new("VIMA_DECODER"),
|
// before 5.0 (< v59)
|
||||||
AVFeature::new("REQUEST_CHANNELS"),
|
|
||||||
AVFeature::new("OLD_DECODE_AUDIO"),
|
|
||||||
AVFeature::new("OLD_ENCODE_AUDIO"),
|
|
||||||
AVFeature::new("OLD_ENCODE_VIDEO"),
|
|
||||||
AVFeature::new("CODEC_ID"),
|
|
||||||
AVFeature::new("AUDIO_CONVERT"),
|
|
||||||
AVFeature::new("AVCODEC_RESAMPLE"),
|
|
||||||
AVFeature::new("DEINTERLACE"),
|
|
||||||
AVFeature::new("DESTRUCT_PACKET"),
|
|
||||||
AVFeature::new("GET_BUFFER"),
|
|
||||||
AVFeature::new("MISSING_SAMPLE"),
|
|
||||||
AVFeature::new("LOWRES"),
|
AVFeature::new("LOWRES"),
|
||||||
AVFeature::new("CAP_VDPAU"),
|
|
||||||
AVFeature::new("BUFS_VDPAU"),
|
|
||||||
AVFeature::new("VOXWARE"),
|
|
||||||
AVFeature::new("SET_DIMENSIONS"),
|
|
||||||
AVFeature::new("DEBUG_MV"),
|
|
||||||
AVFeature::new("AC_VLC"),
|
|
||||||
AVFeature::new("OLD_MSMPEG4"),
|
|
||||||
AVFeature::new("ASPECT_EXTENDED"),
|
|
||||||
AVFeature::new("THREAD_OPAQUE"),
|
|
||||||
AVFeature::new("CODEC_PKT"),
|
|
||||||
AVFeature::new("ARCH_ALPHA"),
|
|
||||||
AVFeature::new("ERROR_RATE"),
|
|
||||||
AVFeature::new("QSCALE_TYPE"),
|
|
||||||
AVFeature::new("MB_TYPE"),
|
|
||||||
AVFeature::new("MAX_BFRAMES"),
|
|
||||||
AVFeature::new("NEG_LINESIZES"),
|
|
||||||
AVFeature::new("EMU_EDGE"),
|
|
||||||
AVFeature::new("ARCH_SH4"),
|
|
||||||
AVFeature::new("ARCH_SPARC"),
|
|
||||||
AVFeature::new("UNUSED_MEMBERS"),
|
|
||||||
AVFeature::new("IDCT_XVIDMMX"),
|
|
||||||
AVFeature::new("INPUT_PRESERVED"),
|
|
||||||
AVFeature::new("NORMALIZE_AQP"),
|
|
||||||
AVFeature::new("GMC"),
|
|
||||||
AVFeature::new("MV0"),
|
|
||||||
AVFeature::new("CODEC_NAME"),
|
|
||||||
AVFeature::new("AFD"),
|
|
||||||
AVFeature::new("VISMV"),
|
|
||||||
AVFeature::new("DV_FRAME_PROFILE"),
|
|
||||||
AVFeature::new("AUDIOENC_DELAY"),
|
|
||||||
AVFeature::new("VAAPI_CONTEXT"),
|
|
||||||
AVFeature::new("AVCTX_TIMEBASE"),
|
|
||||||
AVFeature::new("MPV_OPT"),
|
|
||||||
AVFeature::new("STREAM_CODEC_TAG"),
|
|
||||||
AVFeature::new("QUANT_BIAS"),
|
|
||||||
AVFeature::new("RC_STRATEGY"),
|
|
||||||
AVFeature::new("CODED_FRAME"),
|
AVFeature::new("CODED_FRAME"),
|
||||||
AVFeature::new("MOTION_EST"),
|
|
||||||
AVFeature::new("WITHOUT_PREFIX"),
|
|
||||||
AVFeature::new("CONVERGENCE_DURATION"),
|
AVFeature::new("CONVERGENCE_DURATION"),
|
||||||
AVFeature::new("PRIVATE_OPT"),
|
AVFeature::new("PRIVATE_OPT"),
|
||||||
AVFeature::new("CODER_TYPE"),
|
AVFeature::new("CODER_TYPE"),
|
||||||
@ -187,15 +128,18 @@ static AVCODEC_FEATURES: &[AVFeature] = &[
|
|||||||
AVFeature::new("VBV_DELAY"),
|
AVFeature::new("VBV_DELAY"),
|
||||||
AVFeature::new("SIDEDATA_ONLY_PKT"),
|
AVFeature::new("SIDEDATA_ONLY_PKT"),
|
||||||
AVFeature::new("AVPICTURE"),
|
AVFeature::new("AVPICTURE"),
|
||||||
|
// before 6.0 (< v60)
|
||||||
AVFeature::new("OPENH264_SLICE_MODE"),
|
AVFeature::new("OPENH264_SLICE_MODE"),
|
||||||
AVFeature::new("OPENH264_CABAC"),
|
AVFeature::new("OPENH264_CABAC"),
|
||||||
AVFeature::new("UNUSED_CODEC_CAPS"),
|
AVFeature::new("UNUSED_CODEC_CAPS"),
|
||||||
AVFeature::new("THREAD_SAFE_CALLBACKS"),
|
AVFeature::new("THREAD_SAFE_CALLBACKS"),
|
||||||
|
AVFeature::new("DEBUG_MV"),
|
||||||
AVFeature::new("GET_FRAME_CLASS"),
|
AVFeature::new("GET_FRAME_CLASS"),
|
||||||
AVFeature::new("AUTO_THREADS"),
|
AVFeature::new("AUTO_THREADS"),
|
||||||
AVFeature::new("INIT_PACKET"),
|
AVFeature::new("AVCTX_TIMEBASE"),
|
||||||
AVFeature::new("FLAG_TRUNCATED"),
|
AVFeature::new("FLAG_TRUNCATED"),
|
||||||
AVFeature::new("SUB_TEXT_FORMAT"),
|
AVFeature::new("SUB_TEXT_FORMAT"),
|
||||||
|
// before 7.0 (< v61)
|
||||||
AVFeature::new("IDCT_NONE"),
|
AVFeature::new("IDCT_NONE"),
|
||||||
AVFeature::new("SVTAV1_OPTS"),
|
AVFeature::new("SVTAV1_OPTS"),
|
||||||
AVFeature::new("AYUV_CODECID"),
|
AVFeature::new("AYUV_CODECID"),
|
||||||
@ -204,6 +148,7 @@ static AVCODEC_FEATURES: &[AVFeature] = &[
|
|||||||
AVFeature::new("VT_HWACCEL_CONTEXT"),
|
AVFeature::new("VT_HWACCEL_CONTEXT"),
|
||||||
AVFeature::new("AVCTX_FRAME_NUMBER"),
|
AVFeature::new("AVCTX_FRAME_NUMBER"),
|
||||||
AVFeature::new("SLICE_OFFSET"),
|
AVFeature::new("SLICE_OFFSET"),
|
||||||
|
// before 8.0 (< v62)
|
||||||
AVFeature::new("SUBFRAMES"),
|
AVFeature::new("SUBFRAMES"),
|
||||||
AVFeature::new("TICKS_PER_FRAME"),
|
AVFeature::new("TICKS_PER_FRAME"),
|
||||||
AVFeature::new("DROPCHANGED"),
|
AVFeature::new("DROPCHANGED"),
|
||||||
@ -213,58 +158,67 @@ static AVCODEC_FEATURES: &[AVFeature] = &[
|
|||||||
AVFeature::new("BUFFER_MIN_SIZE"),
|
AVFeature::new("BUFFER_MIN_SIZE"),
|
||||||
AVFeature::new("VDPAU_ALLOC_GET_SET"),
|
AVFeature::new("VDPAU_ALLOC_GET_SET"),
|
||||||
AVFeature::new("QUALITY_FACTOR"),
|
AVFeature::new("QUALITY_FACTOR"),
|
||||||
|
AVFeature::new("INIT_PACKET"),
|
||||||
|
AVFeature::new("TICKS_PER_FRAME"),
|
||||||
|
AVFeature::new("DROPCHANGED"),
|
||||||
|
AVFeature::new("AVFFT"),
|
||||||
|
AVFeature::new("FF_PROFILE_LEVEL"),
|
||||||
|
AVFeature::new("AVCODEC_CLOSE"),
|
||||||
|
AVFeature::new("BUFFER_MIN_SIZE"),
|
||||||
|
AVFeature::new("VDPAU_ALLOC_GET_SET"),
|
||||||
|
AVFeature::new("QUALITY_FACTOR"),
|
||||||
];
|
];
|
||||||
|
|
||||||
static AVFORMAT_FEATURES: &[AVFeature] = &[
|
static AVFORMAT_FEATURES: &[AVFeature] = &[
|
||||||
AVFeature::new("LAVF_BITEXACT"),
|
// before 5.0 (< v59)
|
||||||
AVFeature::new("LAVF_FRAC"),
|
|
||||||
AVFeature::new("URL_FEOF"),
|
|
||||||
AVFeature::new("PROBESIZE_32"),
|
|
||||||
AVFeature::new("LAVF_AVCTX"),
|
AVFeature::new("LAVF_AVCTX"),
|
||||||
AVFeature::new("OLD_OPEN_CALLBACKS"),
|
AVFeature::new("OLD_OPEN_CALLBACKS"),
|
||||||
|
// before 6.0 (< v60)
|
||||||
AVFeature::new("LAVF_PRIV_OPT"),
|
AVFeature::new("LAVF_PRIV_OPT"),
|
||||||
AVFeature::new("COMPUTE_PKT_FIELDS2"),
|
|
||||||
AVFeature::new("AVIOCONTEXT_WRITTEN"),
|
AVFeature::new("AVIOCONTEXT_WRITTEN"),
|
||||||
AVFeature::new("AVSTREAM_CLASS"),
|
// before 7.0 (< v61)
|
||||||
AVFeature::new("R_FRAME_RATE"),
|
|
||||||
AVFeature::new("GET_END_PTS"),
|
AVFeature::new("GET_END_PTS"),
|
||||||
AVFeature::new("AVIODIRCONTEXT"),
|
AVFeature::new("AVIODIRCONTEXT"),
|
||||||
AVFeature::new("AVFORMAT_IO_CLOSE"),
|
AVFeature::new("AVFORMAT_IO_CLOSE"),
|
||||||
AVFeature::new("AVIO_WRITE_NONCONST"),
|
AVFeature::new("AVIO_WRITE_NONCONST"),
|
||||||
|
// before 8.0 (< v62)
|
||||||
|
AVFeature::new("COMPUTE_PKT_FIELDS2"),
|
||||||
AVFeature::new("LAVF_SHORTEST"),
|
AVFeature::new("LAVF_SHORTEST"),
|
||||||
AVFeature::new("ALLOW_FLUSH"),
|
AVFeature::new("ALLOW_FLUSH"),
|
||||||
AVFeature::new("AVSTREAM_SIDE_DATA"),
|
AVFeature::new("AVSTREAM_SIDE_DATA"),
|
||||||
AVFeature::new("GET_DUR_ESTIMATE_METHOD"),
|
AVFeature::new("GET_DUR_ESTIMATE_METHOD"),
|
||||||
AVFeature::new("INTERNAL_TIMING"),
|
AVFeature::new("INTERNAL_TIMING"),
|
||||||
|
// after 5.0 (> v59)
|
||||||
|
AVFeature::new("AVSTREAM_CLASS"),
|
||||||
|
// for all eternity
|
||||||
|
AVFeature::new("R_FRAME_RATE"),
|
||||||
];
|
];
|
||||||
|
|
||||||
static AVDEVICE_FEATURES: &[AVFeature] = &[
|
static AVDEVICE_FEATURES: &[AVFeature] = &[
|
||||||
|
// before 6.0 (< v60)
|
||||||
AVFeature::new("DEVICE_CAPABILITIES"),
|
AVFeature::new("DEVICE_CAPABILITIES"),
|
||||||
|
// before 8.0 (< v62)
|
||||||
AVFeature::new("BKTR_DEVICE"),
|
AVFeature::new("BKTR_DEVICE"),
|
||||||
AVFeature::new("OPENGL_DEVICE"),
|
AVFeature::new("OPENGL_DEVICE"),
|
||||||
AVFeature::new("SDL2_DEVICE"),
|
AVFeature::new("SDL2_DEVICE"),
|
||||||
];
|
];
|
||||||
|
|
||||||
static AVFILTER_FEATURES: &[AVFeature] = &[
|
static AVFILTER_FEATURES: &[AVFeature] = &[
|
||||||
AVFeature::new("AVFILTERPAD_PUBLIC"),
|
// before 5.0 (< v8)
|
||||||
AVFeature::new("FOO_COUNT"),
|
|
||||||
AVFeature::new("OLD_FILTER_OPTS"),
|
|
||||||
AVFeature::new("OLD_FILTER_OPTS_ERROR"),
|
AVFeature::new("OLD_FILTER_OPTS_ERROR"),
|
||||||
AVFeature::new("AVFILTER_OPEN"),
|
// before 6.0 (< v9)
|
||||||
AVFeature::new("OLD_FILTER_REGISTER"),
|
|
||||||
AVFeature::new("OLD_GRAPH_PARSE"),
|
|
||||||
AVFeature::new("NOCONST_GET_NAME"),
|
|
||||||
AVFeature::new("SWS_PARAM_OPTION"),
|
AVFeature::new("SWS_PARAM_OPTION"),
|
||||||
AVFeature::new("BUFFERSINK_ALLOC"),
|
AVFeature::new("BUFFERSINK_ALLOC"),
|
||||||
AVFeature::new("PAD_COUNT"),
|
AVFeature::new("PAD_COUNT"),
|
||||||
|
// before 7.0 (< v10)
|
||||||
AVFeature::new("LIBPLACEBO_OPTS"),
|
AVFeature::new("LIBPLACEBO_OPTS"),
|
||||||
|
// before 8.0 (< v11)
|
||||||
AVFeature::new("LINK_PUBLIC"),
|
AVFeature::new("LINK_PUBLIC"),
|
||||||
];
|
];
|
||||||
|
|
||||||
static AVRESAMPLE_FEATURES: &[AVFeature] = &[AVFeature::new("RESAMPLE_CLOSE_OPEN")];
|
static AVRESAMPLE_FEATURES: &[AVFeature] = &[];
|
||||||
|
|
||||||
static SWSCALE_FEATURES: &[AVFeature] =
|
static SWSCALE_FEATURES: &[AVFeature] = &[];
|
||||||
&[AVFeature::new("SWS_CPU_CAPS"), AVFeature::new("ARCH_BFIN")];
|
|
||||||
|
|
||||||
static SWRESAMPLE_FEATURES: &[AVFeature] = &[];
|
static SWRESAMPLE_FEATURES: &[AVFeature] = &[];
|
||||||
|
|
||||||
@ -863,7 +817,10 @@ fn check_features(include_paths: &[PathBuf]) {
|
|||||||
.expect("Unable to find the version for lib{lib}");
|
.expect("Unable to find the version for lib{lib}");
|
||||||
|
|
||||||
// This allows removing a lot of #[cfg] attributes.
|
// This allows removing a lot of #[cfg] attributes.
|
||||||
assert!(lavc_version >= (58, 54), "FFmpeg 4.2 or higher is required, but found avcodec version {lavc_version:?}");
|
assert!(
|
||||||
|
lavc_version >= (58, 54),
|
||||||
|
"FFmpeg 4.2 or higher is required, but found avcodec version {lavc_version:?}"
|
||||||
|
);
|
||||||
|
|
||||||
for &(ffmpeg_version_flag, lavc_version_major, lavc_version_minor) in &ffmpeg_lavc_versions {
|
for &(ffmpeg_version_flag, lavc_version_major, lavc_version_minor) in &ffmpeg_lavc_versions {
|
||||||
// Every possible feature needs an unconditional check-cfg to prevent warnings
|
// Every possible feature needs an unconditional check-cfg to prevent warnings
|
||||||
|
@ -121,14 +121,6 @@ impl Video {
|
|||||||
unsafe { format::Pixel::from((*self.as_ptr()).pix_fmt) }
|
unsafe { format::Pixel::from((*self.as_ptr()).pix_fmt) }
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
|
||||||
#[cfg(feature = "ff_api_motion_est")]
|
|
||||||
pub fn set_motion_estimation(&mut self, value: MotionEstimation) {
|
|
||||||
unsafe {
|
|
||||||
(*self.as_mut_ptr()).me_method = value.into();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn set_max_b_frames(&mut self, value: usize) {
|
pub fn set_max_b_frames(&mut self, value: usize) {
|
||||||
unsafe {
|
unsafe {
|
||||||
@ -292,30 +284,6 @@ impl Video {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
|
||||||
#[cfg(feature = "ff_api_quant_bias")]
|
|
||||||
pub fn set_intra_quant_bias(&mut self, value: Option<usize>) {
|
|
||||||
unsafe {
|
|
||||||
if let Some(value) = value {
|
|
||||||
(*self.as_mut_ptr()).intra_quant_bias = value as c_int;
|
|
||||||
} else {
|
|
||||||
(*self.as_mut_ptr()).intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
#[cfg(feature = "ff_api_quant_bias")]
|
|
||||||
pub fn set_inter_quant_bias(&mut self, value: Option<usize>) {
|
|
||||||
unsafe {
|
|
||||||
if let Some(value) = value {
|
|
||||||
(*self.as_mut_ptr()).inter_quant_bias = value as c_int;
|
|
||||||
} else {
|
|
||||||
(*self.as_mut_ptr()).inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn set_mb_decision(&mut self, value: Decision) {
|
pub fn set_mb_decision(&mut self, value: Decision) {
|
||||||
unsafe {
|
unsafe {
|
||||||
|
@ -361,8 +361,6 @@ pub enum Id {
|
|||||||
MLP,
|
MLP,
|
||||||
GSM_MS,
|
GSM_MS,
|
||||||
ATRAC3,
|
ATRAC3,
|
||||||
#[cfg(feature = "ff_api_voxware")]
|
|
||||||
VOXWARE,
|
|
||||||
APE,
|
APE,
|
||||||
NELLYMOSER,
|
NELLYMOSER,
|
||||||
MUSEPACK8,
|
MUSEPACK8,
|
||||||
@ -651,9 +649,6 @@ pub enum Id {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Id {
|
impl Id {
|
||||||
#[cfg(feature = "ff_api_vima_decoder")]
|
|
||||||
pub const VIMA: Id = Id::ADPCM_VIMA;
|
|
||||||
|
|
||||||
pub fn medium(&self) -> media::Type {
|
pub fn medium(&self) -> media::Type {
|
||||||
unsafe { media::Type::from(avcodec_get_type((*self).into())) }
|
unsafe { media::Type::from(avcodec_get_type((*self).into())) }
|
||||||
}
|
}
|
||||||
@ -1016,8 +1011,6 @@ impl From<AVCodecID> for Id {
|
|||||||
AV_CODEC_ID_MLP => Id::MLP,
|
AV_CODEC_ID_MLP => Id::MLP,
|
||||||
AV_CODEC_ID_GSM_MS => Id::GSM_MS,
|
AV_CODEC_ID_GSM_MS => Id::GSM_MS,
|
||||||
AV_CODEC_ID_ATRAC3 => Id::ATRAC3,
|
AV_CODEC_ID_ATRAC3 => Id::ATRAC3,
|
||||||
#[cfg(feature = "ff_api_voxware")]
|
|
||||||
AV_CODEC_ID_VOXWARE => Id::VOXWARE,
|
|
||||||
AV_CODEC_ID_APE => Id::APE,
|
AV_CODEC_ID_APE => Id::APE,
|
||||||
AV_CODEC_ID_NELLYMOSER => Id::NELLYMOSER,
|
AV_CODEC_ID_NELLYMOSER => Id::NELLYMOSER,
|
||||||
AV_CODEC_ID_MUSEPACK8 => Id::MUSEPACK8,
|
AV_CODEC_ID_MUSEPACK8 => Id::MUSEPACK8,
|
||||||
@ -1664,8 +1657,6 @@ impl From<Id> for AVCodecID {
|
|||||||
Id::MLP => AV_CODEC_ID_MLP,
|
Id::MLP => AV_CODEC_ID_MLP,
|
||||||
Id::GSM_MS => AV_CODEC_ID_GSM_MS,
|
Id::GSM_MS => AV_CODEC_ID_GSM_MS,
|
||||||
Id::ATRAC3 => AV_CODEC_ID_ATRAC3,
|
Id::ATRAC3 => AV_CODEC_ID_ATRAC3,
|
||||||
#[cfg(feature = "ff_api_voxware")]
|
|
||||||
Id::VOXWARE => AV_CODEC_ID_VOXWARE,
|
|
||||||
Id::APE => AV_CODEC_ID_APE,
|
Id::APE => AV_CODEC_ID_APE,
|
||||||
Id::NELLYMOSER => AV_CODEC_ID_NELLYMOSER,
|
Id::NELLYMOSER => AV_CODEC_ID_NELLYMOSER,
|
||||||
Id::MUSEPACK8 => AV_CODEC_ID_MUSEPACK8,
|
Id::MUSEPACK8 => AV_CODEC_ID_MUSEPACK8,
|
||||||
|
@ -54,16 +54,6 @@ pub enum Pixel {
|
|||||||
YUV440P,
|
YUV440P,
|
||||||
YUVJ440P,
|
YUVJ440P,
|
||||||
YUVA420P,
|
YUVA420P,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_H264,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_MPEG1,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_MPEG2,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_WMV3,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_VC1,
|
|
||||||
RGB48BE,
|
RGB48BE,
|
||||||
RGB48LE,
|
RGB48LE,
|
||||||
|
|
||||||
@ -92,8 +82,6 @@ pub enum Pixel {
|
|||||||
YUV422P16BE,
|
YUV422P16BE,
|
||||||
YUV444P16LE,
|
YUV444P16LE,
|
||||||
YUV444P16BE,
|
YUV444P16BE,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
VDPAU_MPEG4,
|
|
||||||
DXVA2_VLD,
|
DXVA2_VLD,
|
||||||
|
|
||||||
RGB444LE,
|
RGB444LE,
|
||||||
@ -513,16 +501,6 @@ impl From<AVPixelFormat> for Pixel {
|
|||||||
AV_PIX_FMT_YUV440P => Pixel::YUV440P,
|
AV_PIX_FMT_YUV440P => Pixel::YUV440P,
|
||||||
AV_PIX_FMT_YUVJ440P => Pixel::YUVJ440P,
|
AV_PIX_FMT_YUVJ440P => Pixel::YUVJ440P,
|
||||||
AV_PIX_FMT_YUVA420P => Pixel::YUVA420P,
|
AV_PIX_FMT_YUVA420P => Pixel::YUVA420P,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_H264 => Pixel::VDPAU_H264,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_MPEG1 => Pixel::VDPAU_MPEG1,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_MPEG2 => Pixel::VDPAU_MPEG2,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_WMV3 => Pixel::VDPAU_WMV3,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_VC1 => Pixel::VDPAU_VC1,
|
|
||||||
AV_PIX_FMT_RGB48BE => Pixel::RGB48BE,
|
AV_PIX_FMT_RGB48BE => Pixel::RGB48BE,
|
||||||
AV_PIX_FMT_RGB48LE => Pixel::RGB48LE,
|
AV_PIX_FMT_RGB48LE => Pixel::RGB48LE,
|
||||||
|
|
||||||
@ -551,8 +529,6 @@ impl From<AVPixelFormat> for Pixel {
|
|||||||
AV_PIX_FMT_YUV422P16BE => Pixel::YUV422P16BE,
|
AV_PIX_FMT_YUV422P16BE => Pixel::YUV422P16BE,
|
||||||
AV_PIX_FMT_YUV444P16LE => Pixel::YUV444P16LE,
|
AV_PIX_FMT_YUV444P16LE => Pixel::YUV444P16LE,
|
||||||
AV_PIX_FMT_YUV444P16BE => Pixel::YUV444P16BE,
|
AV_PIX_FMT_YUV444P16BE => Pixel::YUV444P16BE,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
AV_PIX_FMT_VDPAU_MPEG4 => Pixel::VDPAU_MPEG4,
|
|
||||||
AV_PIX_FMT_DXVA2_VLD => Pixel::DXVA2_VLD,
|
AV_PIX_FMT_DXVA2_VLD => Pixel::DXVA2_VLD,
|
||||||
|
|
||||||
AV_PIX_FMT_RGB444LE => Pixel::RGB444LE,
|
AV_PIX_FMT_RGB444LE => Pixel::RGB444LE,
|
||||||
@ -865,16 +841,6 @@ impl From<Pixel> for AVPixelFormat {
|
|||||||
Pixel::YUV440P => AV_PIX_FMT_YUV440P,
|
Pixel::YUV440P => AV_PIX_FMT_YUV440P,
|
||||||
Pixel::YUVJ440P => AV_PIX_FMT_YUVJ440P,
|
Pixel::YUVJ440P => AV_PIX_FMT_YUVJ440P,
|
||||||
Pixel::YUVA420P => AV_PIX_FMT_YUVA420P,
|
Pixel::YUVA420P => AV_PIX_FMT_YUVA420P,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_H264 => AV_PIX_FMT_VDPAU_H264,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_MPEG1 => AV_PIX_FMT_VDPAU_MPEG1,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_MPEG2 => AV_PIX_FMT_VDPAU_MPEG2,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_WMV3 => AV_PIX_FMT_VDPAU_WMV3,
|
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_VC1 => AV_PIX_FMT_VDPAU_VC1,
|
|
||||||
Pixel::RGB48BE => AV_PIX_FMT_RGB48BE,
|
Pixel::RGB48BE => AV_PIX_FMT_RGB48BE,
|
||||||
Pixel::RGB48LE => AV_PIX_FMT_RGB48LE,
|
Pixel::RGB48LE => AV_PIX_FMT_RGB48LE,
|
||||||
|
|
||||||
@ -903,8 +869,6 @@ impl From<Pixel> for AVPixelFormat {
|
|||||||
Pixel::YUV422P16BE => AV_PIX_FMT_YUV422P16BE,
|
Pixel::YUV422P16BE => AV_PIX_FMT_YUV422P16BE,
|
||||||
Pixel::YUV444P16LE => AV_PIX_FMT_YUV444P16LE,
|
Pixel::YUV444P16LE => AV_PIX_FMT_YUV444P16LE,
|
||||||
Pixel::YUV444P16BE => AV_PIX_FMT_YUV444P16BE,
|
Pixel::YUV444P16BE => AV_PIX_FMT_YUV444P16BE,
|
||||||
#[cfg(feature = "ff_api_vdpau")]
|
|
||||||
Pixel::VDPAU_MPEG4 => AV_PIX_FMT_VDPAU_MPEG4,
|
|
||||||
Pixel::DXVA2_VLD => AV_PIX_FMT_DXVA2_VLD,
|
Pixel::DXVA2_VLD => AV_PIX_FMT_DXVA2_VLD,
|
||||||
|
|
||||||
Pixel::RGB444LE => AV_PIX_FMT_RGB444LE,
|
Pixel::RGB444LE => AV_PIX_FMT_RGB444LE,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user