X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fmod.rs;h=14c6c8778ac1b0a3b969ddec6a19ae93e852d8ca;hb=71d7f39706f0f5004820f8d1d36c87d5f9ec3e97;hp=3caa51c1ba232db68c5923e71c85e6b8c00ef49b;hpb=b7c882c1ce6f86c07c2340751200e3a060942826;p=nihav.git

diff --git a/nihav-game/src/codecs/mod.rs b/nihav-game/src/codecs/mod.rs
index 3caa51c..14c6c87 100644
--- a/nihav-game/src/codecs/mod.rs
+++ b/nihav-game/src/codecs/mod.rs
@@ -1,9 +1,19 @@
 use nihav_core::codecs::*;
 
+#[allow(unused_macros)]
+#[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_arxel_vid")]
+pub mod arxel_vid;
+#[cfg(any(feature="decoder_beam_vbv",feature="decoder_beam_fcp"))]
+pub mod beam;
 #[cfg(feature="decoder_bmv")]
 pub mod bmv;
 #[cfg(feature="decoder_bmv3")]
@@ -12,14 +22,22 @@ pub mod bmv3;
 pub mod futurevision;
 #[cfg(feature="decoder_gdvvid")]
 pub mod gremlinvideo;
+#[cfg(feature="decoder_hl_fmv")]
+pub mod hl_fmv;
 #[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(any(feature="decoder_smush_video", feature="decoder_smush_audio"))]
+pub mod smush;
 #[cfg(feature="decoder_vmd")]
 pub mod vmd;
 #[cfg(feature="decoder_vx")]
@@ -32,6 +50,12 @@ const GAME_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "gdv-audio", get_decoder: gremlinvideo::get_decoder_audio },
 #[cfg(feature="decoder_gdvvid")]
     DecoderInfo { name: "gdv-video", get_decoder: gremlinvideo::get_decoder_video },
+#[cfg(feature="decoder_arxel_vid")]
+    DecoderInfo { name: "arxel-video", get_decoder: arxel_vid::get_decoder },
+#[cfg(feature="decoder_beam_fcp")]
+    DecoderInfo { name: "beam-fcp", get_decoder: beam::get_decoder_fcp },
+#[cfg(feature="decoder_beam_vbv")]
+    DecoderInfo { name: "beam-video", get_decoder: beam::get_decoder_vbv },
 #[cfg(feature="decoder_bmv")]
     DecoderInfo { name: "bmv-audio", get_decoder: bmv::get_decoder_audio },
 #[cfg(feature="decoder_bmv")]
@@ -44,8 +68,24 @@ const GAME_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "fst-audio", get_decoder: futurevision::get_decoder_audio },
 #[cfg(feature="decoder_fstvid")]
     DecoderInfo { name: "fst-video", get_decoder: futurevision::get_decoder_video },
+#[cfg(feature="decoder_hl_fmv")]
+    DecoderInfo { name: "hl-fmv-video", get_decoder: hl_fmv::get_decoder },
 #[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_video")]
+    DecoderInfo { name: "smushv1", get_decoder: smush::get_decoder_video_v1 },
+#[cfg(feature="decoder_smush_video")]
+    DecoderInfo { name: "smushv2", get_decoder: smush::get_decoder_video_v2 },
+#[cfg(feature="decoder_smush_audio")]
+    DecoderInfo { name: "smush-iact", get_decoder: smush::get_decoder_iact },
+#[cfg(feature="decoder_smush_audio")]
+    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")]