X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fmod.rs;h=656be0a081039f08c2bb1790fa82b5be98020d67;hp=f0a47dce97da088a31507d9a4a7bf402783a29f6;hb=6a4942885d50ab644f27d0d25aee0b2740dce509;hpb=1b8522d6275f5a8e252b7c7283ed4d80a594db93

diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs
index f0a47dc..656be0a 100644
--- a/nihav-duck/src/codecs/mod.rs
+++ b/nihav-duck/src/codecs/mod.rs
@@ -12,19 +12,26 @@ mod truemotionrt;
 mod truemotion2;
 #[cfg(feature="decoder_truemotion2x")]
 mod truemotion2x;
-#[cfg(feature="decoder_truemotion3")]
-mod truemotion3;
-#[cfg(feature="decoder_truemotion4")]
-mod truemotion4;
-#[cfg(feature="decoder_truemotion5")]
-mod truemotion5;
-#[cfg(feature="decoder_truemotion6")]
-mod truemotion6;
-#[cfg(feature="decoder_truemotion7")]
-mod truemotion7;
+#[cfg(any(feature="decoder_vp3", feature="decoder_vp4", feature="decoder_vp5", feature="decoder_vp6", feature="decoder_vp7"))]
+#[macro_use]
+mod vpcommon;
+#[cfg(any(feature="decoder_vp3", feature="decoder_vp4"))]
+mod vp3;
+#[cfg(any(feature="decoder_vp5", feature="decoder_vp6"))]
+mod vp56;
+#[cfg(feature="decoder_vp5")]
+mod vp5;
+#[cfg(feature="decoder_vp6")]
+mod vp6;
+#[cfg(feature="decoder_vp7")]
+mod vp7;
 
+#[cfg(any(feature="decoder_dk3_adpcm", feature="decoder_dk4_adpcm"))]
+mod dkadpcm;
 #[cfg(feature="decoder_on2avc")]
 mod on2avc;
+#[cfg(feature="decoder_on2avc")]
+mod on2avcdata;
 
 const DUCK_CODECS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_truemotion1")]
@@ -35,17 +42,23 @@ const DUCK_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "truemotion2", get_decoder: truemotion2::get_decoder },
 #[cfg(feature="decoder_truemotion2x")]
     DecoderInfo { name: "truemotion2x", get_decoder: truemotion2x::get_decoder },
-#[cfg(feature="decoder_truemotion3")]
-    DecoderInfo { name: "truemotion3", get_decoder: truemotion3::get_decoder },
-#[cfg(feature="decoder_truemotion4")]
-    DecoderInfo { name: "truemotion4", get_decoder: truemotion4::get_decoder },
-#[cfg(feature="decoder_truemotion5")]
-    DecoderInfo { name: "truemotion5", get_decoder: truemotion5::get_decoder },
-#[cfg(feature="decoder_truemotion6")]
-    DecoderInfo { name: "truemotion6", get_decoder: truemotion6::get_decoder },
-#[cfg(feature="decoder_truemotion7")]
-    DecoderInfo { name: "truemotion7", get_decoder: truemotion7::get_decoder },
+#[cfg(feature="decoder_vp3")]
+    DecoderInfo { name: "vp3", get_decoder: vp3::get_decoder_vp3 },
+#[cfg(feature="decoder_vp4")]
+    DecoderInfo { name: "vp4", get_decoder: vp3::get_decoder_vp4 },
+#[cfg(feature="decoder_vp5")]
+    DecoderInfo { name: "vp5", get_decoder: vp5::get_decoder },
+#[cfg(feature="decoder_vp6")]
+    DecoderInfo { name: "vp6", get_decoder: vp6::get_decoder_vp6 },
+#[cfg(feature="decoder_vp6")]
+    DecoderInfo { name: "vp6a", get_decoder: vp6::get_decoder_vp6_alpha },
+#[cfg(feature="decoder_vp7")]
+    DecoderInfo { name: "vp7", get_decoder: vp7::get_decoder },
 
+#[cfg(feature="decoder_dk3_adpcm")]
+    DecoderInfo { name: "adpcm-dk3", get_decoder: dkadpcm::get_decoder_dk3 },
+#[cfg(feature="decoder_dk4_adpcm")]
+    DecoderInfo { name: "adpcm-dk4", get_decoder: dkadpcm::get_decoder_dk4 },
 #[cfg(feature="decoder_on2avc")]
     DecoderInfo { name: "on2avc-500", get_decoder: on2avc::get_decoder_500 },
 #[cfg(feature="decoder_on2avc")]
@@ -53,7 +66,7 @@ const DUCK_CODECS: &[DecoderInfo] = &[
 ];
 
 pub fn duck_register_all_codecs(rd: &mut RegisteredDecoders) {
-    for decoder in DUCK_CODECS.into_iter() {
+    for decoder in DUCK_CODECS.iter() {
         rd.add_decoder(decoder.clone());
     }
 }