X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fmod.rs;h=85523d6b6a4e151a4087879fcd0179f088c34cd3;hb=e5ee9a29f58a41bae17bfb3657b2698bd54efb63;hp=a5a8ec3bbd3ec67eb9a2e4ab82a8dc74eba6bbbe;hpb=b7c882c1ce6f86c07c2340751200e3a060942826;p=nihav.git

diff --git a/nihav-indeo/src/codecs/mod.rs b/nihav-indeo/src/codecs/mod.rs
index a5a8ec3..85523d6 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;
@@ -10,6 +15,8 @@ mod intel263;
 mod indeo2;
 #[cfg(feature="decoder_indeo3")]
 mod indeo3;
+#[cfg(any(feature="decoder_indeo3", feature="encoder_indeo3"))]
+mod indeo3data;
 #[cfg(feature="decoder_indeo4")]
 mod indeo4;
 #[cfg(feature="decoder_indeo5")]
@@ -37,6 +44,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 },
 
@@ -52,3 +61,19 @@ pub fn indeo_register_all_decoders(rd: &mut RegisteredDecoders) {
         rd.add_decoder(*decoder);
     }
 }
+
+#[cfg(feature="encoder_indeo3")]
+mod indeo3enc;
+
+const INDEO_ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_indeo3")]
+    EncoderInfo { name: "indeo3", get_encoder: indeo3enc::get_encoder },
+];
+
+/// Registers all available encoders provided by this crate.
+pub fn indeo_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in INDEO_ENCODERS.iter() {
+        re.add_encoder(*encoder);
+    }
+}
+