X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fmod.rs;h=57f39a30c54d95f3841db53d4fb800ca6edfddc6;hb=7bf82b3370b7a5579ebc62a1b003f4bf2e3515f8;hp=bc343fe388d998c76c152922253c7655efb3ce56;hpb=f2af8ecaeed8ec8c1fa6b3c2cfdb075d64994b7a;p=nihav.git diff --git a/nihav-indeo/src/codecs/mod.rs b/nihav-indeo/src/codecs/mod.rs index bc343fe..57f39a3 100644 --- a/nihav-indeo/src/codecs/mod.rs +++ b/nihav-indeo/src/codecs/mod.rs @@ -1,8 +1,13 @@ use nihav_core::codecs::*; +#[cfg(debug_assertions)] macro_rules! validate { ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } }; } +#[cfg(not(debug_assertions))] +macro_rules! validate { + ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } }; +} #[cfg(feature="decoder_intel263")] mod intel263; @@ -37,6 +42,8 @@ const INDEO_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "indeo4", get_decoder: indeo4::get_decoder }, #[cfg(feature="decoder_indeo5")] DecoderInfo { name: "indeo5", get_decoder: indeo5::get_decoder }, +#[cfg(feature="decoder_indeo5")] + DecoderInfo { name: "indeo5s", get_decoder: indeo5::get_decoder_scalable }, #[cfg(feature="decoder_intel263")] DecoderInfo { name: "intel263", get_decoder: intel263::get_decoder }, @@ -46,8 +53,9 @@ const INDEO_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "iac", get_decoder: imc::get_decoder_iac }, ]; -pub fn indeo_register_all_codecs(rd: &mut RegisteredDecoders) { +/// Registers all available codecs provided by this crate. +pub fn indeo_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in INDEO_CODECS.iter() { - rd.add_decoder(decoder.clone()); + rd.add_decoder(*decoder); } }