fix clippy warnings

[nihav.git] / nihav-commonfmt / src / codecs / mod.rs

diff --git a/nihav-commonfmt/src/codecs/mod.rs b/nihav-commonfmt/src/codecs/mod.rs
index 9cedec97fac190fd83f0b479ffa48a7c4ba9ef65..ad8a8c6604b40cd9ab3fa2e9305a25b3703b004e 100644 (file)
--- a/nihav-commonfmt/src/codecs/mod.rs
+++ b/nihav-commonfmt/src/codecs/mod.rs
@@ -1,18 +1,27 @@
 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_jpeg")]
+mod jpeg;
+#[cfg(feature="decoder_rawvideo")]
+mod rawvideo;
+#[cfg(feature="decoder_rawvideo_ms")]
+mod rawvideo_ms;
+#[cfg(feature="decoder_zmbv")]
+mod zmbv;
 
-#[cfg(feature="decoder_aac")]
-#[allow(clippy::manual_memcpy)]
-#[allow(clippy::useless_let_if_seq)]
-mod aac;
 #[cfg(feature="decoder_atrac3")]
 #[allow(clippy::identity_op)]
 #[allow(clippy::useless_let_if_seq)]
@@ -21,12 +30,14 @@ 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;
 #[cfg(feature="decoder_ts102366")]
 mod ts102366;
 
+#[cfg(feature="decoders")]
 const DECODERS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_cinepak")]
     DecoderInfo { name: "cinepak", get_decoder: cinepak::get_decoder },
@@ -34,6 +45,14 @@ 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_jpeg")]
+    DecoderInfo { name: "jpeg", get_decoder: jpeg::get_decoder },
+#[cfg(feature="decoder_rawvideo")]
+    DecoderInfo { name: "rawvideo", get_decoder: rawvideo::get_decoder },
+#[cfg(feature="decoder_rawvideo_ms")]
+    DecoderInfo { name: "rawvideo-ms", get_decoder: rawvideo_ms::get_decoder },
+#[cfg(feature="decoder_zmbv")]
+    DecoderInfo { name: "zmbv", get_decoder: zmbv::get_decoder },
 
 #[cfg(feature="decoder_pcm")]
     DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },
@@ -47,32 +66,41 @@ const DECODERS: &[DecoderInfo] = &[
     DecoderInfo { name: "ac3", get_decoder: ts102366::get_decoder },
 #[cfg(feature="decoder_atrac3")]
     DecoderInfo { name: "atrac3", get_decoder: atrac3::get_decoder },
-#[cfg(feature="decoder_aac")]
-    DecoderInfo { name: "aac", get_decoder: aac::get_decoder },
 ];
 
 /// Registers all available codecs provided by this crate.
-pub fn generic_register_all_codecs(rd: &mut RegisteredDecoders) {
+#[cfg(feature="decoders")]
+pub fn generic_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in DECODERS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
     }
 }
 
 #[cfg(feature="encoder_cinepak")]
 mod cinepakenc;
+#[cfg(feature="encoder_rawvideo")]
+mod rawvideoenc;
+#[cfg(feature="encoder_zmbv")]
+mod zmbvenc;
 
+#[cfg(feature="encoders")]
 const ENCODERS: &[EncoderInfo] = &[
 #[cfg(feature="encoder_cinepak")]
     EncoderInfo { name: "cinepak", get_encoder: cinepakenc::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 },
 
 #[cfg(feature="encoder_pcm")]
     EncoderInfo { name: "pcm", get_encoder: pcm::get_encoder },
 ];
 
 /// Registers all available encoders provided by this crate.
+#[cfg(feature="encoders")]
 pub fn generic_register_all_encoders(re: &mut RegisteredEncoders) {
     for encoder in ENCODERS.iter() {
-        re.add_encoder(encoder.clone());
+        re.add_encoder(*encoder);
     }
 }