RealAudio 14.4 and 28.8 decoders

[nihav.git] / src / codecs / mod.rs

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index 4897a7b6533bc7192237beacb81686a7b2f613ff..61f4c21ba63c90890163261ed227e18d2fd89f71 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -138,6 +138,22 @@ impl IPBShuffler {
             None
         }
     }
+    #[allow(dead_code)]
+    fn get_b_fwdref(&mut self) -> Option<NAVideoBuffer<u8>> {
+        if let Some(ref frm) = self.nextframe {
+            Some(frm.clone())
+        } else {
+            None
+        }
+    }
+    #[allow(dead_code)]
+    fn get_b_bwdref(&mut self) -> Option<NAVideoBuffer<u8>> {
+        if let Some(ref frm) = self.lastframe {
+            Some(frm.clone())
+        } else {
+            None
+        }
+    }
 }
 
 #[derive(Debug,Clone,Copy)]
@@ -219,7 +235,7 @@ pub struct DecoderInfo {
     get_decoder: fn () -> Box<NADecoder>,
 }
 
-#[cfg(feature="h263")]
+#[cfg(any(feature="h263", feature="decoder_realvideo3", feature="decoder_realvideo4"))]
 mod blockdsp;
 
 #[cfg(feature="decoder_clearvideo")]
@@ -230,6 +246,8 @@ mod gremlinvideo;
 mod indeo;
 #[cfg(feature="h263")]
 mod h263;
+#[cfg(any(feature="decoder_realvideo3", feature="decoder_realvideo4", feature="decoder_realvideo6", feature="decoder_realaudio144", feature="decoder_realaudio288"))]
+mod real;
 
 #[cfg(feature="decoder_pcm")]
 mod pcm;
@@ -255,6 +273,12 @@ const DECODERS: &[DecoderInfo] = &[
     DecoderInfo { name: "realvideo1", get_decoder: h263::rv10::get_decoder },
 #[cfg(feature="decoder_realvideo2")]
     DecoderInfo { name: "realvideo2", get_decoder: h263::rv20::get_decoder },
+#[cfg(feature="decoder_realvideo3")]
+    DecoderInfo { name: "realvideo3", get_decoder: real::rv30::get_decoder },
+#[cfg(feature="decoder_realvideo4")]
+    DecoderInfo { name: "realvideo4", get_decoder: real::rv40::get_decoder },
+#[cfg(feature="decoder_realvideo6")]
+    DecoderInfo { name: "realvideo6", get_decoder: real::rv60::get_decoder },
 
 #[cfg(feature="decoder_pcm")]
     DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },
@@ -262,6 +286,10 @@ const DECODERS: &[DecoderInfo] = &[
     DecoderInfo { name: "imc", get_decoder: indeo::imc::get_decoder_imc },
 #[cfg(feature="decoder_imc")]
     DecoderInfo { name: "iac", get_decoder: indeo::imc::get_decoder_iac },
+#[cfg(feature="decoder_realaudio144")]
+    DecoderInfo { name: "ra14.4", get_decoder: real::ra144::get_decoder },
+#[cfg(feature="decoder_realaudio288")]
+    DecoderInfo { name: "ra28.8", get_decoder: real::ra288::get_decoder },
 ];
 
 pub fn find_decoder(name: &str) -> Option<fn () -> Box<NADecoder>> {