Skip to content

fix non-exhaustive patterns error #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix non-exhaustive patterns error #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49812ad
Update pixel.rs
altunenes Jul 12, 2023
67d29d0
Update id.rs
altunenes Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/codec/id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ use util::media;
pub enum Id {
None,

PDV,
EVC,
RTV1,
VMIX,
AC4,
SMPTE2038,

// video codecs
MPEG1VIDEO,
MPEG2VIDEO,
Expand Down Expand Up @@ -664,6 +671,14 @@ impl From<AVCodecID> 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,
Expand Down Expand Up @@ -1304,6 +1319,14 @@ impl From<Id> 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,
Expand Down
16 changes: 15 additions & 1 deletion src/util/format/pixel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,11 @@ pub enum Pixel {
GRAY10LE,
P016LE,
P016BE,

P212BE,
P212LE,
P412BE,
P412LE,

D3D11,
GRAY9BE,
GRAY9LE,
Expand Down Expand Up @@ -504,6 +508,11 @@ impl From<AVPixelFormat> 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,
Expand Down Expand Up @@ -881,6 +890,11 @@ impl From<Pixel> 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")))]
Expand Down