Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump version to use ffmpeg 5

Browse Source
This commit is contained in:
Polochon-street
2022-01-24 21:03:47 +01:00
parent 5ed41c84ff
commit 22ad8b9598
43 changed files with 310 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/util/format/pixel.rs
View File

@ -73,13 +73,13 @@ pub enum Pixel {
BGR555BE,
BGR555LE,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
VAAPI_MOCO,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
VAAPI_IDCT,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
VAAPI_VLD,
#[cfg(not(feature = "ff_api_vaapi"))]
#[cfg(any(not(feature = "ff_api_vaapi"), feature = "ffmpeg_5_0"))]
VAAPI,
YUV420P16LE,
@ -347,6 +347,27 @@ pub enum Pixel {
#[cfg(feature = "ffmpeg_4_4")]
X2RGB10BE,
#[cfg(feature = "ffmpeg_5_0")]
X2BGR10LE,
#[cfg(feature = "ffmpeg_5_0")]
X2BGR10BE,
#[cfg(feature = "ffmpeg_5_0")]
P210BE,
#[cfg(feature = "ffmpeg_5_0")]
P210LE,
#[cfg(feature = "ffmpeg_5_0")]
P410BE,
#[cfg(feature = "ffmpeg_5_0")]
P410LE,
#[cfg(feature = "ffmpeg_5_0")]
P216BE,
#[cfg(feature = "ffmpeg_5_0")]
P216LE,
#[cfg(feature = "ffmpeg_5_0")]
P416BE,
#[cfg(feature = "ffmpeg_5_0")]
P416LE,
#[cfg(feature = "rpi")]
RPI,
#[cfg(feature = "rpi")]
@ -478,12 +499,14 @@ impl From<AVPixelFormat> for Pixel {
AV_PIX_FMT_BGR555BE => Pixel::BGR555BE,
AV_PIX_FMT_BGR555LE => Pixel::BGR555LE,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
AV_PIX_FMT_VAAPI_MOCO => Pixel::VAAPI_MOCO,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
AV_PIX_FMT_VAAPI_IDCT => Pixel::VAAPI_IDCT,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
AV_PIX_FMT_VAAPI_VLD => Pixel::VAAPI_VLD,
#[cfg(any(not(feature = "ff_api_vaapi"), feature = "ffmpeg_5_0"))]
AV_PIX_FMT_VAAPI => Pixel::VAAPI,
AV_PIX_FMT_YUV420P16LE => Pixel::YUV420P16LE,
AV_PIX_FMT_YUV420P16BE => Pixel::YUV420P16BE,
@ -686,6 +709,27 @@ impl From<AVPixelFormat> for Pixel {
#[cfg(feature = "ffmpeg_4_4")]
AV_PIX_FMT_X2RGB10BE => Pixel::X2RGB10BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_X2BGR10LE => Pixel::X2BGR10LE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_X2BGR10BE => Pixel::X2BGR10BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P210BE => Pixel::P210BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P210LE => Pixel::P210LE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P410BE => Pixel::P410BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P410LE => Pixel::P410LE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P216BE => Pixel::P216BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P216LE => Pixel::P216LE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P416BE => Pixel::P416BE,
#[cfg(feature = "ffmpeg_5_0")]
AV_PIX_FMT_P416LE => Pixel::P416LE,
#[cfg(feature = "rpi")]
AV_PIX_FMT_RPI => Pixel::RPI,
#[cfg(feature = "rpi")]
@ -771,11 +815,11 @@ impl From<Pixel> for AVPixelFormat {
Pixel::BGR555BE => AV_PIX_FMT_BGR555BE,
Pixel::BGR555LE => AV_PIX_FMT_BGR555LE,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
Pixel::VAAPI_MOCO => AV_PIX_FMT_VAAPI_MOCO,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
Pixel::VAAPI_IDCT => AV_PIX_FMT_VAAPI_IDCT,
#[cfg(feature = "ff_api_vaapi")]
#[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))]
Pixel::VAAPI_VLD => AV_PIX_FMT_VAAPI_VLD,
#[cfg(not(feature = "ff_api_vaapi"))]
Pixel::VAAPI => AV_PIX_FMT_VAAPI,
@ -1045,6 +1089,27 @@ impl From<Pixel> for AVPixelFormat {
#[cfg(feature = "ffmpeg_4_4")]
Pixel::X2RGB10BE => AV_PIX_FMT_X2RGB10BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::X2BGR10LE => AV_PIX_FMT_X2BGR10LE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::X2BGR10BE => AV_PIX_FMT_X2BGR10BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P210BE => AV_PIX_FMT_P210BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P210LE => AV_PIX_FMT_P210LE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P410BE => AV_PIX_FMT_P410BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P410LE => AV_PIX_FMT_P410LE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P216BE => AV_PIX_FMT_P216BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P216LE => AV_PIX_FMT_P216LE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P416BE => AV_PIX_FMT_P416BE,
#[cfg(feature = "ffmpeg_5_0")]
Pixel::P416LE => AV_PIX_FMT_P416LE,
#[cfg(feature = "rpi")]
Pixel::RPI => AV_PIX_FMT_RPI,
#[cfg(feature = "rpi")]