X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fmod.rs;h=686ba4f6eb3ea0b83e449c68776f2e59ac21a39c;hb=ed91af4b5a98b4be1df4f7e0345e545af87f3175;hp=cf0c8462395ac58c7b80930c3a22468bf848faa9;hpb=820b43313ea6d0e03c7bf063ee6a64f3ff0cf659;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/mod.rs b/nihav-commonfmt/src/codecs/mod.rs index cf0c846..686ba4f 100644 --- a/nihav-commonfmt/src/codecs/mod.rs +++ b/nihav-commonfmt/src/codecs/mod.rs @@ -1,13 +1,20 @@ use nihav_core::codecs::*; +#[cfg(debug_assertions)] macro_rules! validate { ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } }; } +#[cfg(not(debug_assertions))] +macro_rules! validate { + ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } }; +} #[cfg(feature="decoder_cinepak")] mod cinepak; #[cfg(feature="decoder_clearvideo")] mod clearvideo; +#[cfg(feature="decoder_gif")] +mod gif; #[cfg(feature="decoder_jpeg")] mod jpeg; #[cfg(feature="decoder_rawvideo")] @@ -25,6 +32,7 @@ mod atrac3; mod pcm; #[cfg(feature="decoder_sipro")] #[allow(clippy::collapsible_if)] +#[allow(clippy::collapsible_else_if)] #[allow(clippy::identity_op)] #[allow(clippy::manual_memcpy)] mod sipro; @@ -39,6 +47,8 @@ const DECODERS: &[DecoderInfo] = &[ DecoderInfo { name: "clearvideo", get_decoder: clearvideo::get_decoder }, #[cfg(feature="decoder_clearvideo")] DecoderInfo { name: "clearvideo_rm", get_decoder: clearvideo::get_decoder_rm }, +#[cfg(feature="decoder_gif")] + DecoderInfo { name: "gif", get_decoder: gif::get_decoder }, #[cfg(feature="decoder_jpeg")] DecoderInfo { name: "jpeg", get_decoder: jpeg::get_decoder }, #[cfg(feature="decoder_rawvideo")] @@ -72,6 +82,10 @@ pub fn generic_register_all_decoders(rd: &mut RegisteredDecoders) { #[cfg(feature="encoder_cinepak")] mod cinepakenc; +#[cfg(feature="encoder_gif")] +mod gifenc; +#[cfg(feature="encoder_rawvideo")] +mod rawvideoenc; #[cfg(feature="encoder_zmbv")] mod zmbvenc; @@ -79,6 +93,10 @@ mod zmbvenc; const ENCODERS: &[EncoderInfo] = &[ #[cfg(feature="encoder_cinepak")] EncoderInfo { name: "cinepak", get_encoder: cinepakenc::get_encoder }, +#[cfg(feature="encoder_gif")] + EncoderInfo { name: "gif", get_encoder: gifenc::get_encoder }, +#[cfg(feature="encoder_rawvideo")] + EncoderInfo { name: "rawvideo", get_encoder: rawvideoenc::get_encoder }, #[cfg(feature="encoder_zmbv")] EncoderInfo { name: "zmbv", get_encoder: zmbvenc::get_encoder },