aboutsummaryrefslogtreecommitdiffstats
path: root/nihav-duck/src/codecs/mod.rs
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2019-07-14 18:35:04 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2019-08-03 11:53:05 +0200
commit3584b223ce417fe167dc90cb9a40e173f34823c0 (patch)
treea41958d15f52c42fdf8d55f65d985e445f6b3f22 /nihav-duck/src/codecs/mod.rs
parent64e8b9711a54641d4155d01f095053233c79a9bf (diff)
downloadnihav-3584b223ce417fe167dc90cb9a40e173f34823c0.tar.gz
semi-working VP5/6 decoder
Diffstat (limited to 'nihav-duck/src/codecs/mod.rs')
-rw-r--r--nihav-duck/src/codecs/mod.rs15
1 files changed, 11 insertions, 4 deletions
diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs
index 6a00e0f..2c934f1 100644
--- a/nihav-duck/src/codecs/mod.rs
+++ b/nihav-duck/src/codecs/mod.rs
@@ -12,14 +12,19 @@ mod truemotionrt;
mod truemotion2;
#[cfg(feature="decoder_truemotion2x")]
mod truemotion2x;
+#[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_vp3", feature="decoder_vp4", feature="decoder_vp5", feature="decoder_vp6", feature="decoder_vp7"))]
-mod vpcommon;
#[cfg(any(feature="decoder_dk3_adpcm", feature="decoder_dk4_adpcm"))]
mod dkadpcm;
@@ -40,9 +45,11 @@ const DUCK_CODECS: &[DecoderInfo] = &[
#[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 },
+ 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: "vp6", get_decoder: vp56::get_decoder_vp6 },
+ DecoderInfo { name: "vp6a", get_decoder: vp6::get_decoder_vp6_alpha },
#[cfg(feature="decoder_vp7")]
DecoderInfo { name: "vp7", get_decoder: vp7::get_decoder },