vp7: split off data for the upcoming VP8 decoder

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

diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs
index c5412e9683912587b95d88a362261af9360e53d9..1153c13e4ad16b6026a3d2cc0b7f0062df539dcd 100644 (file)
--- a/nihav-duck/src/codecs/mod.rs
+++ b/nihav-duck/src/codecs/mod.rs
@@ -32,6 +32,10 @@ mod vp56;
 #[cfg(feature="decoder_vp5")]
 #[allow(clippy::needless_range_loop)]
 mod vp5;
+#[cfg(any(feature="decoder_vp6", feature="encoder_vp6"))]
+mod vp6data;
+#[cfg(any(feature="decoder_vp6", feature="encoder_vp6"))]
+mod vp6dsp;
 #[cfg(feature="decoder_vp6")]
 #[allow(clippy::needless_range_loop)]
 mod vp6;
@@ -40,13 +44,23 @@ mod vp6;
 #[allow(clippy::useless_let_if_seq)]
 mod vp7;
 #[cfg(feature="decoder_vp7")]
-mod vp7data;
+mod vp78data;
 #[cfg(feature="decoder_vp7")]
 #[allow(clippy::erasing_op)]
 #[allow(clippy::needless_range_loop)]
 #[allow(clippy::too_many_arguments)]
 #[allow(clippy::useless_let_if_seq)]
 mod vp7dsp;
+#[cfg(feature="decoder_vp7")]
+#[allow(clippy::needless_range_loop)]
+#[allow(clippy::useless_let_if_seq)]
+mod vp78;
+#[cfg(feature="decoder_vp7")]
+#[allow(clippy::erasing_op)]
+#[allow(clippy::needless_range_loop)]
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::useless_let_if_seq)]
+mod vp78dsp;
 
 #[cfg(any(feature="decoder_dk3_adpcm", feature="decoder_dk4_adpcm"))]
 mod dkadpcm;
@@ -91,8 +105,24 @@ const DUCK_CODECS: &[DecoderInfo] = &[
 ];
 
 /// Registers all available codecs provided by this crate.
-pub fn duck_register_all_codecs(rd: &mut RegisteredDecoders) {
+pub fn duck_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in DUCK_CODECS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
+    }
+}
+
+#[cfg(feature="encoder_vp6")]
+#[allow(clippy::needless_range_loop)]
+mod vp6enc;
+
+const DUCK_ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_vp6")]
+    EncoderInfo { name: "vp6", get_encoder: vp6enc::get_encoder },
+];
+
+/// Registers all available encoders provided by this crate.
+pub fn duck_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in DUCK_ENCODERS.iter() {
+        re.add_encoder(*encoder);
     }
 }