X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fmod.rs;h=92c547a345ef8966a7ac2f527c09ce908d0f6dc6;hb=b8ea95bcd62ebd2a6b58a889c0a2e0e35fa212d3;hp=4ce556391b12e84b67e00df80cdee7da112a0f61;hpb=606c448ef167017c3171b49f9eb2af82c15079ce;p=nihav.git

diff --git a/nihav-rad/src/codecs/mod.rs b/nihav-rad/src/codecs/mod.rs
index 4ce5563..92c547a 100644
--- a/nihav-rad/src/codecs/mod.rs
+++ b/nihav-rad/src/codecs/mod.rs
@@ -1,15 +1,24 @@
 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(any(feature="decoder_smkaud", feature="decoder_smkvid"))]
 mod smacker;
 #[cfg(feature="decoder_binkaud")]
 mod binkaud;
+#[cfg(any(feature="decoder_binkaud", feature="encoder_binkaud"))]
+mod binkauddata;
 #[cfg(feature="decoder_binkvid")]
 mod binkvid;
+#[cfg(any(feature="decoder_binkvid", feature="encoder_binkvid"))]
+mod binkviddata;
 #[cfg(feature="decoder_bink2")]
 mod bink2;
 
@@ -28,8 +37,32 @@ const RAD_CODECS: &[DecoderInfo] = &[
     DecoderInfo { name: "bink2-video", get_decoder: bink2::get_decoder },
 ];
 
-pub fn rad_register_all_codecs(rd: &mut RegisteredDecoders) {
-    for decoder in RAD_CODECS.into_iter() {
-        rd.add_decoder(decoder.clone());
+/// Registers all available codecs provided by this crate.
+pub fn rad_register_all_decoders(rd: &mut RegisteredDecoders) {
+    for decoder in RAD_CODECS.iter() {
+        rd.add_decoder(*decoder);
+    }
+}
+
+#[cfg(feature="encoder_binkvid")]
+mod binkvidenc;
+#[cfg(feature="encoder_binkaud")]
+mod binkaudenc;
+
+#[cfg(feature="encoders")]
+const ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_binkvid")]
+    EncoderInfo { name: "bink-video", get_encoder: binkvidenc::get_encoder },
+#[cfg(feature="encoder_binkaud")]
+    EncoderInfo { name: "bink-audio-rdft", get_encoder: binkaudenc::get_encoder_rdft },
+//#[cfg(feature="encoder_binkvid")]
+//    EncoderInfo { name: "bink-audio-dct", get_encoder: binkaudenc::get_encoder_dct },
+];
+
+/// Registers all available encoders provided by this crate.
+#[cfg(feature="encoders")]
+pub fn rad_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in ENCODERS.iter() {
+        re.add_encoder(*encoder);
     }
 }