X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fmod.rs;h=c6058a5aeaa4232bccfbe22fab771acc5deb67d9;hb=4965a5e560c5e194c5b5163c591fcade5f56c3f0;hp=cbcdb838c16a45fcc38183a644b71a740a2cfce3;hpb=e64739f87a35f29be0bbbce366876180ba3eb57e;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/mod.rs b/nihav-realmedia/src/codecs/mod.rs
index cbcdb83..c6058a5 100644
--- a/nihav-realmedia/src/codecs/mod.rs
+++ b/nihav-realmedia/src/codecs/mod.rs
@@ -1,12 +1,17 @@
 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;
-#[cfg(any(feature="decoder_realvideo3", feature="decoder_realvideo4"))]
+#[cfg(any(feature="decoder_realvideo3", feature="decoder_realvideo4", feature="encoder_realvideo4"))]
 #[allow(clippy::erasing_op)]
 mod rv34codes;
 #[cfg(any(feature="decoder_realvideo3", feature="decoder_realvideo4"))]
@@ -27,6 +32,8 @@ pub mod rv30;
 pub mod rv30dsp;
 #[cfg(feature="decoder_realvideo4")]
 pub mod rv40;
+#[cfg(any(feature="decoder_realvideo4", feature="encoder_realvideo4"))]
+pub mod rv40data;
 #[cfg(feature="decoder_realvideo4")]
 #[allow(clippy::erasing_op)]
 #[allow(clippy::many_single_char_names)]
@@ -41,11 +48,14 @@ pub mod rv60codes;
 pub mod rv60dsp;
 
 #[cfg(feature="decoder_realaudio144")]
+#[allow(clippy::manual_memcpy)]
 pub mod ra144;
 #[cfg(feature="decoder_realaudio288")]
 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;
 
@@ -72,8 +82,31 @@ 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="encoder_rv40")]
+mod rv40enc;
+
+#[cfg(feature="encoders")]
+const ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_cook")]
+    EncoderInfo { name: "cook", get_encoder: cookenc::get_encoder },
+
+#[cfg(feature="encoder_rv40")]
+    EncoderInfo { name: "realvideo4", get_encoder: rv40enc::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);
     }
 }