RealVideo 1 decoder and RealVideo 2 bitstream parser

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

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index 45005a39e0a100f684b19b438ce56a4b8cf27815..6572f2690dc81f03b67ecbf13f32287e76cc4a35 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -42,7 +42,7 @@ impl From<AllocatorError> for DecoderError {
 }
 
 macro_rules! validate {
-    ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
+    ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } };
 }
 
 #[allow(dead_code)]
@@ -118,7 +118,7 @@ mod blockdsp;
 
 #[cfg(feature="decoder_gdvvid")]
 mod gremlinvideo;
-#[cfg(any(feature="decoder_indeo2", feature="decoder_indeo3", feature="decoder_imc"))]
+#[cfg(any(feature="decoder_indeo2", feature="decoder_indeo3", feature="decoder_indeo4", feature="decoder_indeo5", feature="decoder_imc"))]
 mod indeo;
 #[cfg(feature="h263")]
 mod h263;
@@ -133,8 +133,16 @@ const DECODERS: &[DecoderInfo] = &[
     DecoderInfo { name: "indeo2", get_decoder: indeo::indeo2::get_decoder },
 #[cfg(feature="decoder_indeo3")]
     DecoderInfo { name: "indeo3", get_decoder: indeo::indeo3::get_decoder },
+#[cfg(feature="decoder_indeo4")]
+    DecoderInfo { name: "indeo4", get_decoder: indeo::indeo4::get_decoder },
+#[cfg(feature="decoder_indeo5")]
+    DecoderInfo { name: "indeo5", get_decoder: indeo::indeo5::get_decoder },
 #[cfg(feature="decoder_intel263")]
     DecoderInfo { name: "intel263", get_decoder: h263::intel263::get_decoder },
+#[cfg(feature="decoder_realvideo1")]
+    DecoderInfo { name: "realvideo1", get_decoder: h263::rv10::get_decoder },
+#[cfg(feature="decoder_realvideo2")]
+    DecoderInfo { name: "realvideo2", get_decoder: h263::rv20::get_decoder },
 
 #[cfg(feature="decoder_pcm")]
     DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },