X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fmod.rs;h=b65bcc89cc11a4e7e20c8dc5a37998536934f163;hp=fb30a05fd8eadb5b5cf1d5e1b65fcf0aac114fbe;hb=c17769db76a6effa4c439af78955002f089a73df;hpb=3813fe8a3408aa3b6dcb296ca7203c89f2a6894d diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs index fb30a05..b65bcc8 100644 --- a/nihav-game/src/codecs/mod.rs +++ b/nihav-game/src/codecs/mod.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; +#[allow(unused_macros)] macro_rules! validate { ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } }; } @@ -14,12 +15,18 @@ pub mod futurevision; pub mod gremlinvideo; #[cfg(feature="decoder_imax")] pub mod imax; +#[cfg(feature="decoder_ipma")] +pub mod ipma; #[cfg(feature="decoder_lhst500f22")] pub mod lhst500f22; #[cfg(feature="decoder_midivid")] pub mod midivid; #[cfg(feature="decoder_midivid3")] pub mod midivid3; +#[cfg(feature="decoder_q")] +pub mod q; +#[cfg(feature="decoder_smush")] +pub mod smush; #[cfg(feature="decoder_vmd")] pub mod vmd; #[cfg(feature="decoder_vx")] @@ -46,6 +53,20 @@ const GAME_CODECS: &[DecoderInfo] = &[ DecoderInfo { name: "fst-video", get_decoder: futurevision::get_decoder_video }, #[cfg(feature="decoder_imax")] DecoderInfo { name: "fable-imax", get_decoder: imax::get_decoder }, +#[cfg(feature="decoder_ipma")] + DecoderInfo { name: "ipma", get_decoder: ipma::get_decoder }, +#[cfg(feature="decoder_ipma")] + DecoderInfo { name: "ipma2", get_decoder: ipma::get_decoder_v2 }, +#[cfg(feature="decoder_q")] + DecoderInfo { name: "legend-q-video", get_decoder: q::get_decoder }, +#[cfg(feature="decoder_smush")] + DecoderInfo { name: "smushv1", get_decoder: smush::get_decoder_video_v1 }, +#[cfg(feature="decoder_smush")] + DecoderInfo { name: "smushv2", get_decoder: smush::get_decoder_video_v2 }, +#[cfg(feature="decoder_smush")] + DecoderInfo { name: "smush-iact", get_decoder: smush::get_decoder_iact }, +#[cfg(feature="decoder_smush")] + DecoderInfo { name: "smush-vima", get_decoder: smush::get_decoder_vima }, #[cfg(feature="decoder_vmd")] DecoderInfo { name: "vmd-audio", get_decoder: vmd::get_decoder_audio }, #[cfg(feature="decoder_vmd")] @@ -65,6 +86,6 @@ const GAME_CODECS: &[DecoderInfo] = &[ /// Registers all available codecs provided by this crate. pub fn game_register_all_decoders(rd: &mut RegisteredDecoders) { for decoder in GAME_CODECS.iter() { - rd.add_decoder(decoder.clone()); + rd.add_decoder(*decoder); } }