X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fmod.rs;h=a094f2d345404a7baa92d04ffe22e349df930e12;hb=03011b993dc4873b39d981f62abc01591a0544f7;hp=c614b87fc989148d5b74f9676c0d4728da8c8605;hpb=8a7352c04dd848eea6519f0d775d98d547b90a39;p=nihav.git diff --git a/nihav-duck/src/codecs/mod.rs b/nihav-duck/src/codecs/mod.rs index c614b87..a094f2d 100644 --- a/nihav-duck/src/codecs/mod.rs +++ b/nihav-duck/src/codecs/mod.rs @@ -12,17 +12,30 @@ 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(feature="decoder_vp7")] +mod vp7data; +#[cfg(feature="decoder_vp7")] +mod vp7dsp; #[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")] @@ -38,9 +51,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 }, @@ -54,6 +69,7 @@ const DUCK_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "on2avc-501", get_decoder: on2avc::get_decoder_501 }, ]; +/// Registers all available codecs provided by this crate. pub fn duck_register_all_codecs(rd: &mut RegisteredDecoders) { for decoder in DUCK_CODECS.iter() { rd.add_decoder(decoder.clone());