rename truemotion[3-7] into vp[3-7]

diff --git a/nihav-core/src/register.rs b/nihav-core/src/register.rs
index 7ba6e5378a4233daf9227d29bab104645ccfc289..632aec489fe49c16501cc24de3f4693114a75496 100644 (file)
--- a/nihav-core/src/register.rs
+++ b/nihav-core/src/register.rs
@@ -160,14 +160,14 @@ static AVI_VIDEO_CODEC_REGISTER: &'static [(&[u8;4], &str)] = &[
     (b"TM20", "truemotion2"),
     (b"TM2A", "truemotion2x"),
     (b"TM2X", "truemotion2x"),
-    (b"VP30", "truemotion3"),
-    (b"VP31", "truemotion3"),
-    (b"VP40", "truemotion4"),
-    (b"VP50", "truemotion5"),
-    (b"VP60", "truemotion6"),
-    (b"VP61", "truemotion6"),
-    (b"VP62", "truemotion6"),
-    (b"VP70", "truemotion7"),
+    (b"VP30", "vp3"),
+    (b"VP31", "vp3"),
+    (b"VP40", "vp4"),
+    (b"VP50", "vp5"),
+    (b"VP60", "vp6"),
+    (b"VP61", "vp6"),
+    (b"VP62", "vp6"),
+    (b"VP70", "vp7"),
 ];
 
 static WAV_CODEC_REGISTER: &'static [(u16, &str)] = &[

diff --git a/nihav-duck/Cargo.toml b/nihav-duck/Cargo.toml
index e3d8feef0e52021a7283e734644a54f84f803b33..856f8cf04e88e96ed41b502d028c78f648c20e6b 100644 (file)
--- a/nihav-duck/Cargo.toml
+++ b/nihav-duck/Cargo.toml
@@ -14,18 +14,18 @@ nihav_commonfmt = { path = "../nihav-commonfmt" }
 [features]
 default = ["all_decoders"]
 
-all_decoders = ["decoder_truemotion1", "decoder_truemotionrt", "decoder_dk3_adpcm", "decoder_dk4_adpcm", "decoder_truemotion2"]#, "decoder_truemotion2x", "decoder_truemotion3", "decoder_truemotion4", "decoder_truemotion5", "decoder_truemotion6", "decoder_truemotion7", "decoder_on2avc"]
+all_decoders = ["decoder_truemotion1", "decoder_truemotionrt", "decoder_dk3_adpcm", "decoder_dk4_adpcm", "decoder_truemotion2"]#, "decoder_truemotion2x", "decoder_vp3", "decoder_vp4", "decoder_vp5", "decoder_vp6", "decoder_vp7", "decoder_on2avc"]
 decoders = []
 
 decoder_truemotion1 = ["decoders"]
 decoder_truemotionrt = ["decoders"]
 decoder_truemotion2 = ["decoders"]
 decoder_truemotion2x = ["decoders"]
-decoder_truemotion3 = ["decoders"]
-decoder_truemotion4 = ["decoders"]
-decoder_truemotion5 = ["decoders"]
-decoder_truemotion6 = ["decoders"]
-decoder_truemotion7 = ["decoders"]
+decoder_vp3 = ["decoders"]
+decoder_vp4 = ["decoders"]
+decoder_vp5 = ["decoders"]
+decoder_vp6 = ["decoders"]
+decoder_vp7 = ["decoders"]
 decoder_dk3_adpcm = ["decoders"]
 decoder_dk4_adpcm = ["decoders"]
 decoder_on2avc = ["decoders"]

diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs
index beda73ee673bd5179b1be276cb6d81442c931287..ccd5f36d53f896213d70265f7d0ae21d885e0987 100644 (file)
--- a/nihav-duck/src/codecs/mod.rs
+++ b/nihav-duck/src/codecs/mod.rs
@@ -12,16 +12,12 @@ 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"))]
+mod vp3;
+#[cfg(any(feature="decoder_vp5", feature="decoder_vp6"))]
+mod vp56;
+#[cfg(feature="decoder_vp7")]
+mod vp7;
 
 #[cfg(any(feature="decoder_dk3_adpcm", feature="decoder_dk4_adpcm"))]
 mod dkadpcm;
@@ -37,16 +33,16 @@ 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: vp56::get_decoder_vp5 },
+#[cfg(feature="decoder_vp6")]
+    DecoderInfo { name: "vp6", get_decoder: vp56::get_decoder_vp6 },
+#[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 },