From 49812ad2ba145961587c3529c1b2a6b5285339e8 Mon Sep 17 00:00:00 2001 From: Enes <54986652+altunenes@users.noreply.github.com> Date: Wed, 12 Jul 2023 21:50:49 +0300 Subject: [PATCH 1/2] Update pixel.rs solution for "non-exhaustive patterns" --- src/util/format/pixel.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/util/format/pixel.rs b/src/util/format/pixel.rs index 93f94e6c..e5295526 100644 --- a/src/util/format/pixel.rs +++ b/src/util/format/pixel.rs @@ -300,7 +300,11 @@ pub enum Pixel { GRAY10LE, P016LE, P016BE, - + P212BE, + P212LE, + P412BE, + P412LE, + D3D11, GRAY9BE, GRAY9LE, @@ -504,6 +508,11 @@ impl From for Pixel { AV_PIX_FMT_ABGR => Pixel::ABGR, AV_PIX_FMT_BGRA => Pixel::BGRA, + AV_PIX_FMT_P212BE => Pixel::P212BE, + AV_PIX_FMT_P212LE => Pixel::P212LE, + AV_PIX_FMT_P412BE => Pixel::P412BE, + AV_PIX_FMT_P412LE => Pixel::P412LE, + AV_PIX_FMT_GRAY16BE => Pixel::GRAY16BE, AV_PIX_FMT_GRAY16LE => Pixel::GRAY16LE, AV_PIX_FMT_YUV440P => Pixel::YUV440P, @@ -881,6 +890,11 @@ impl From for AVPixelFormat { Pixel::BGR555BE => AV_PIX_FMT_BGR555BE, Pixel::BGR555LE => AV_PIX_FMT_BGR555LE, + Pixel::P212BE => AV_PIX_FMT_P212BE, + Pixel::P212LE => AV_PIX_FMT_P212LE, + Pixel::P412BE => AV_PIX_FMT_P412BE, + Pixel::P412LE => AV_PIX_FMT_P412LE, + #[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))] Pixel::VAAPI_MOCO => AV_PIX_FMT_VAAPI_MOCO, #[cfg(all(feature = "ff_api_vaapi", not(feature = "ffmpeg_5_0")))] From 67d29d0115bfbffad67391e9b921b5a8d8b15a86 Mon Sep 17 00:00:00 2001 From: Enes <54986652+altunenes@users.noreply.github.com> Date: Wed, 12 Jul 2023 21:55:09 +0300 Subject: [PATCH 2/2] Update id.rs AVCodecID implementations: --- src/codec/id.rs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/codec/id.rs b/src/codec/id.rs index aed11b53..77c5b7df 100644 --- a/src/codec/id.rs +++ b/src/codec/id.rs @@ -10,6 +10,13 @@ use util::media; pub enum Id { None, + PDV, + EVC, + RTV1, + VMIX, + AC4, + SMPTE2038, + // video codecs MPEG1VIDEO, MPEG2VIDEO, @@ -664,6 +671,14 @@ impl From for Id { match value { AV_CODEC_ID_NONE => Id::None, + AV_CODEC_ID_PDV => Id::PDV, + AV_CODEC_ID_EVC => Id::EVC, + AV_CODEC_ID_RTV1 => Id::RTV1, + + AV_CODEC_ID_VMIX => Id::VMIX, + AV_CODEC_ID_AC4 => Id::AC4, + AV_CODEC_ID_SMPTE_2038 => Id::SMPTE2038, + /* video codecs */ AV_CODEC_ID_MPEG1VIDEO => Id::MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO => Id::MPEG2VIDEO, @@ -1304,6 +1319,14 @@ impl From for AVCodecID { match value { Id::None => AV_CODEC_ID_NONE, + Id::PDV => AV_CODEC_ID_PDV, + Id::EVC => AV_CODEC_ID_EVC, + Id::RTV1 => AV_CODEC_ID_RTV1, + + Id::VMIX => AV_CODEC_ID_VMIX, + Id::AC4 => AV_CODEC_ID_AC4, + Id::SMPTE2038 => AV_CODEC_ID_SMPTE_2038, + /* video codecs */ Id::MPEG1VIDEO => AV_CODEC_ID_MPEG1VIDEO, Id::MPEG2VIDEO => AV_CODEC_ID_MPEG2VIDEO,