Intel Music/Audio Coder plus DSP and other bits for it

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

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index ec67a4d7a9a38d78b3b2f91d8460528c4f161ee9..cdbc06bcf3a2da6e15322dd0edb05ea493fe20bd 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -9,6 +9,7 @@ use io::codebook::CodebookError;
 #[allow(dead_code)]
 pub enum DecoderError {
     NoFrame,
+    AllocError,
     TryAgain,
     InvalidData,
     ShortData,
@@ -36,15 +37,14 @@ impl From<CodebookError> for DecoderError {
     fn from(_: CodebookError) -> Self { DecoderError::InvalidData }
 }
 
+impl From<AllocatorError> for DecoderError {
+    fn from(_: AllocatorError) -> Self { DecoderError::AllocError }
+}
+
 macro_rules! validate {
     ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
 }
 
-mod blockdsp;
-mod blockdec;
-mod h263code;
-mod h263data;
-
 #[allow(dead_code)]
 struct HAMShuffler {
     lastframe: Option<NAVideoBuffer<u8>>,
@@ -113,14 +113,16 @@ pub struct DecoderInfo {
     get_decoder: fn () -> Box<NADecoder>,
 }
 
+#[cfg(feature="h263")]
+mod blockdsp;
+
 #[cfg(feature="decoder_gdvvid")]
 mod gremlinvideo;
-#[cfg(feature="decoder_indeo2")]
-mod indeo2;
-#[cfg(feature="decoder_indeo3")]
-mod indeo3;
+#[cfg(any(feature="decoder_indeo2", feature="decoder_indeo3", feature="decoder_imc"))]
+mod indeo;
+#[cfg(feature="h263")]
+mod h263;
 
-mod intel263;
 #[cfg(feature="decoder_pcm")]
 mod pcm;
 
@@ -128,14 +130,18 @@ const DECODERS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_gdvvid")]
     DecoderInfo { name: "gdv-video", get_decoder: gremlinvideo::get_decoder },
 #[cfg(feature="decoder_indeo2")]
-    DecoderInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
+    DecoderInfo { name: "indeo2", get_decoder: indeo::indeo2::get_decoder },
 #[cfg(feature="decoder_indeo3")]
-    DecoderInfo { name: "indeo3", get_decoder: indeo3::get_decoder },
-
-    DecoderInfo { name: "intel263", get_decoder: intel263::get_decoder },
+    DecoderInfo { name: "indeo3", get_decoder: indeo::indeo3::get_decoder },
+#[cfg(feature="decoder_intel263")]
+    DecoderInfo { name: "intel263", get_decoder: h263::intel263::get_decoder },
 
 #[cfg(feature="decoder_pcm")]
     DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },
+#[cfg(feature="decoder_imc")]
+    DecoderInfo { name: "imc", get_decoder: indeo::imc::get_decoder_imc },
+#[cfg(feature="decoder_imc")]
+    DecoderInfo { name: "iac", get_decoder: indeo::imc::get_decoder_iac },
 ];
 
 pub fn find_decoder(name: &str) -> Option<fn () -> Box<NADecoder>> {