projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
semi-working VP5/6 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 6a00e0f21715678277fa0c6d6b55a30b97424f10..2c934f18a828e0e8ec9925dcee42285f5560e79e 100644
(file)
--- 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;
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(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(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;
#[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")]
#[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")]
#[cfg(feature="decoder_vp6")]
- DecoderInfo { name: "vp6
", get_decoder: vp56::get_decoder_vp6
},
+ DecoderInfo { name: "vp6
a", get_decoder: vp6::get_decoder_vp6_alpha
},
#[cfg(feature="decoder_vp7")]
DecoderInfo { name: "vp7", get_decoder: vp7::get_decoder },
#[cfg(feature="decoder_vp7")]
DecoderInfo { name: "vp7", get_decoder: vp7::get_decoder },