X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fmod.rs;h=987cc8dba8d008361dd9e8175804f3d426c07afc;hb=eb904044a1f5b78864bd009fced613d63d072034;hp=b8ad7bed1a91da7600eca7360ecfae291c33f343;hpb=fa57381ec2a3b8c441aa1388492b9ca037cfcf78;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/mod.rs b/nihav-realmedia/src/codecs/mod.rs
index b8ad7be..987cc8d 100644
--- a/nihav-realmedia/src/codecs/mod.rs
+++ b/nihav-realmedia/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(any(feature="decoder_realvideo3", feature="decoder_realvideo4"))]
 mod rv3040;
@@ -28,6 +33,8 @@ pub mod rv30dsp;
 #[cfg(feature="decoder_realvideo4")]
 pub mod rv40;
 #[cfg(feature="decoder_realvideo4")]
+pub mod rv40data;
+#[cfg(feature="decoder_realvideo4")]
 #[allow(clippy::erasing_op)]
 #[allow(clippy::many_single_char_names)]
 pub mod rv40dsp;
@@ -47,6 +54,8 @@ pub mod ra144;
 pub mod ra288;
 #[cfg(feature="decoder_cook")]
 pub mod cook;
+#[cfg(any(feature="decoder_cook", feature="encoder_cook"))]
+pub mod cookdata;
 #[cfg(feature="decoder_ralf")]
 pub mod ralf;
 
@@ -73,8 +82,25 @@ const RM_CODECS: &[DecoderInfo] = &[
 ];
 
 /// Registers all available codecs provided by this crate.
-pub fn realmedia_register_all_codecs(rd: &mut RegisteredDecoders) {
+pub fn realmedia_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in RM_CODECS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
+    }
+}
+
+#[cfg(feature="encoder_cook")]
+mod cookenc;
+
+#[cfg(feature="encoders")]
+const ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_cook")]
+    EncoderInfo { name: "cook", get_encoder: cookenc::get_encoder },
+];
+
+/// Registers all available encoders provided by this crate.
+#[cfg(feature="encoders")]
+pub fn realmedia_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in ENCODERS.iter() {
+        re.add_encoder(*encoder);
     }
 }