115 - Handle unsupported pixel formats properly

Cargo.toml

@@ -15,7 +15,7 @@ keywords      = ["ffmpeg", "multimedia", "video", "audio"]
 categories    = ["multimedia"]
 
 [features]
-default = ["codec", "device", "filter", "format", "software-resampling", "software-scaling"]
+default = ["codec", "device", "filter", "format", "software-resampling", "software-scaling", "non-exhaustive-enums"]
 
 # ffmpeg<xy> are obsolete features kept for backward compatibility purposes and
 # don't do anything anymore (equivalents are automatically specified through
@@ -29,6 +29,9 @@ ffmpeg4 = []
 static = ["ffmpeg-sys-next/static"]
 build  = ["static", "ffmpeg-sys-next/build"]
 
+# mark enums in generated bindings as #[non_exhaustive]
+non-exhaustive-enums = ["ffmpeg-sys-next/non-exhaustive-enums"]
+
 # licensing
 build-license-gpl      = ["ffmpeg-sys-next/build-license-gpl"]
 build-license-nonfree  = ["ffmpeg-sys-next/build-license-nonfree"]

src/codec/audio_service.rs

@@ -27,6 +27,9 @@ impl From<AVAudioServiceType> for AudioService {
             AV_AUDIO_SERVICE_TYPE_VOICE_OVER => AudioService::VoiceOver,
             AV_AUDIO_SERVICE_TYPE_KARAOKE => AudioService::Karaoke,
             AV_AUDIO_SERVICE_TYPE_NB => AudioService::Main,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/codec/discard.rs

@@ -22,6 +22,9 @@ impl From<AVDiscard> for Discard {
             AVDISCARD_NONINTRA => Discard::NonIntra,
             AVDISCARD_NONKEY => Discard::NonKey,
             AVDISCARD_ALL => Discard::All,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/codec/field_order.rs

@@ -20,6 +20,9 @@ impl From<AVFieldOrder> for FieldOrder {
             AV_FIELD_BB => FieldOrder::BB,
             AV_FIELD_TB => FieldOrder::TB,
             AV_FIELD_BT => FieldOrder::BT,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/codec/id.rs

@@ -1295,6 +1295,9 @@ impl From<AVCodecID> for Id {
             AV_CODEC_ID_VNULL => Id::VNULL,
             #[cfg(feature = "ffmpeg_6_0")]
             AV_CODEC_ID_ANULL => Id::ANULL,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/codec/packet/side_data.rs

@@ -106,6 +106,9 @@ impl From<AVPacketSideDataType> for Type {
 
             #[cfg(feature = "ffmpeg_5_0")]
             AV_PKT_DATA_DYNAMIC_HDR10_PLUS => Type::DYNAMIC_HDR10_PLUS,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/codec/subtitle/mod.rs

@@ -29,6 +29,9 @@ impl From<AVSubtitleType> for Type {
             SUBTITLE_BITMAP => Type::Bitmap,
             SUBTITLE_TEXT => Type::Text,
             SUBTITLE_ASS => Type::Ass,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/software/resampling/dither.rs

@@ -34,6 +34,9 @@ impl From<SwrDitherType> for Dither {
             SWR_DITHER_NS_LOW_SHIBATA => Dither::NoiseShapingLowShibata,
             SWR_DITHER_NS_HIGH_SHIBATA => Dither::NoiseShapingHighShibata,
             SWR_DITHER_NB => Dither::None,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/software/resampling/engine.rs

@@ -13,6 +13,9 @@ impl From<SwrEngine> for Engine {
             SWR_ENGINE_SWR => Engine::Software,
             SWR_ENGINE_SOXR => Engine::SoundExchange,
             SWR_ENGINE_NB => Engine::Software,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/software/resampling/filter.rs

@@ -14,6 +14,9 @@ impl From<SwrFilterType> for Filter {
             SWR_FILTER_TYPE_CUBIC => Filter::Cubic,
             SWR_FILTER_TYPE_BLACKMAN_NUTTALL => Filter::BlackmanNuttall,
             SWR_FILTER_TYPE_KAISER => Filter::Kaiser,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/chroma/location.rs

@@ -23,6 +23,9 @@ impl From<AVChromaLocation> for Location {
             AVCHROMA_LOC_BOTTOMLEFT => Location::BottomLeft,
             AVCHROMA_LOC_BOTTOM => Location::Bottom,
             AVCHROMA_LOC_NB => Location::Unspecified,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/color/primaries.rs

@@ -66,6 +66,9 @@ impl From<AVColorPrimaries> for Primaries {
             AVCOL_PRI_JEDEC_P22 => Primaries::JEDEC_P22,
             #[cfg(feature = "ffmpeg_4_3")]
             AVCOL_PRI_EBU3213 => Primaries::EBU3213,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/color/range.rs

@@ -31,6 +31,9 @@ impl From<AVColorRange> for Range {
             AVCOL_RANGE_MPEG => Range::MPEG,
             AVCOL_RANGE_JPEG => Range::JPEG,
             AVCOL_RANGE_NB => Range::Unspecified,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/color/space.rs

@@ -59,6 +59,9 @@ impl From<AVColorSpace> for Space {
             AVCOL_SPC_CHROMA_DERIVED_NCL => Space::ChromaDerivedNCL,
             AVCOL_SPC_CHROMA_DERIVED_CL => Space::ChromaDerivedCL,
             AVCOL_SPC_ICTCP => Space::ICTCP,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/color/transfer_characteristic.rs

@@ -63,6 +63,9 @@ impl From<AVColorTransferCharacteristic> for TransferCharacteristic {
             AVCOL_TRC_SMPTE2084 => TransferCharacteristic::SMPTE2084,
             AVCOL_TRC_SMPTE428 => TransferCharacteristic::SMPTE428,
             AVCOL_TRC_ARIB_STD_B67 => TransferCharacteristic::ARIB_STD_B67,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/format/pixel.rs

@@ -808,10 +808,13 @@ impl From<AVPixelFormat> for Pixel {
             AV_PIX_FMT_RPI4_8 => Pixel::RPI4_8,
             #[cfg(feature = "rpi")]
             AV_PIX_FMT_RPI4_10 => Pixel::RPI4_10,
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }
 
+#[allow(unreachable_patterns)]
 impl From<Pixel> for AVPixelFormat {
     #[inline]
     fn from(value: Pixel) -> AVPixelFormat {
@@ -1221,6 +1224,8 @@ impl From<Pixel> for AVPixelFormat {
             Pixel::RPI4_8 => AV_PIX_FMT_RPI4_8,
             #[cfg(feature = "rpi")]
             Pixel::RPI4_10 => AV_PIX_FMT_RPI4_10,
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!("Not all current or future pixel formats are supported yet"),
         }
     }
 }

src/util/format/sample.rs

@@ -86,6 +86,9 @@ impl From<AVSampleFormat> for Sample {
             AV_SAMPLE_FMT_DBLP => Sample::F64(Type::Planar),
 
             AV_SAMPLE_FMT_NB => Sample::None,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/frame/side_data.rs

@@ -126,6 +126,8 @@ impl From<AVFrameSideDataType> for Type {
 
             #[cfg(feature = "ffmpeg_6_0")]
             AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT => Type::AMBIENT_VIEWING_ENVIRONMENT,
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/mathematics/rounding.rs

@@ -21,6 +21,9 @@ impl From<AVRounding> for Rounding {
             AV_ROUND_UP => Rounding::Up,
             AV_ROUND_NEAR_INF => Rounding::NearInfinity,
             AV_ROUND_PASS_MINMAX => Rounding::PassMinMax,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/media.rs

@@ -22,6 +22,9 @@ impl From<AVMediaType> for Type {
             AVMEDIA_TYPE_SUBTITLE => Type::Subtitle,
             AVMEDIA_TYPE_ATTACHMENT => Type::Attachment,
             AVMEDIA_TYPE_NB => Type::Unknown,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/option/mod.rs

@@ -53,6 +53,9 @@ impl From<AVOptionType> for Type {
             AV_OPT_TYPE_CHANNEL_LAYOUT => Type::ChannelLayout,
             #[cfg(feature = "ffmpeg_5_1")]
             AV_OPT_TYPE_CHLAYOUT => Type::ChannelLayout,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }

src/util/picture.rs

@@ -25,6 +25,9 @@ impl From<AVPictureType> for Type {
             AV_PICTURE_TYPE_SI => Type::SI,
             AV_PICTURE_TYPE_SP => Type::SP,
             AV_PICTURE_TYPE_BI => Type::BI,
+
+            #[cfg(feature = "non-exhaustive-enums")]
+            _ => unimplemented!(),
         }
     }
 }