X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fmod.rs;h=57f39a30c54d95f3841db53d4fb800ca6edfddc6;hb=71d7f39706f0f5004820f8d1d36c87d5f9ec3e97;hp=63bad8398273217495cc514113282267e101612b;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git

diff --git a/nihav-indeo/src/codecs/mod.rs b/nihav-indeo/src/codecs/mod.rs
index 63bad83..57f39a3 100644
--- a/nihav-indeo/src/codecs/mod.rs
+++ b/nihav-indeo/src/codecs/mod.rs
@@ -1,8 +1,13 @@
 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_intel263")]
 mod intel263;
@@ -20,9 +25,12 @@ mod ivi;
 #[cfg(any(feature="decoder_indeo4", feature="decoder_indeo5"))]
 mod ivibr;
 #[cfg(any(feature="decoder_indeo4", feature="decoder_indeo5"))]
+#[allow(clippy::erasing_op)]
 mod ividsp;
 
 #[cfg(feature="decoder_imc")]
+#[allow(clippy::excessive_precision)]
+#[allow(clippy::unreadable_literal)]
 mod imc;
 
 const INDEO_CODECS: &[DecoderInfo] = &[
@@ -34,6 +42,8 @@ const INDEO_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "indeo4", get_decoder: indeo4::get_decoder },
 #[cfg(feature="decoder_indeo5")]
     DecoderInfo { name: "indeo5", get_decoder: indeo5::get_decoder },
+#[cfg(feature="decoder_indeo5")]
+    DecoderInfo { name: "indeo5s", get_decoder: indeo5::get_decoder_scalable },
 #[cfg(feature="decoder_intel263")]
     DecoderInfo { name: "intel263", get_decoder: intel263::get_decoder },
 
@@ -43,8 +53,9 @@ const INDEO_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "iac", get_decoder: imc::get_decoder_iac },
 ];
 
-pub fn indeo_register_all_codecs(rd: &mut RegisteredDecoders) {
-    for decoder in INDEO_CODECS.into_iter() {
-        rd.add_decoder(decoder.clone());
+/// Registers all available codecs provided by this crate.
+pub fn indeo_register_all_decoders(rd: &mut RegisteredDecoders) {
+    for decoder in INDEO_CODECS.iter() {
+        rd.add_decoder(*decoder);
     }
 }