add PCM decoder(rewrapper)

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

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index ff75af9fbd4a0c9532bc3d7f49e6b1b4b9d6573e..206032e6997b63c5cbb7c9dfc6ee5a916fbf71a9 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -1,9 +1,11 @@
 #[cfg(feature="decoder_indeo2")]
 pub mod indeo2;
+#[cfg(feature="decoder_pcm")]
+pub mod pcm;
 
-use std::rc::Rc;
 use frame::*;
-use demuxers::*;
+use std::rc::Rc;
+use std::cell::RefCell;
 use io::byteio::ByteIOError;
 use io::bitreader::BitReaderError;
 use io::codebook::CodebookError;
@@ -37,20 +39,55 @@ impl From<CodebookError> for DecoderError {
     fn from(_: CodebookError) -> Self { DecoderError::InvalidData }
 }
 
+#[allow(dead_code)]
+struct HAMShuffler {
+    lastframe: Option<NAVideoBuffer<u8>>,
+}
+
+impl HAMShuffler {
+    #[allow(dead_code)]
+    fn new() -> Self { HAMShuffler { lastframe: None } }
+    #[allow(dead_code)]
+    fn clear(&mut self) { self.lastframe = None; }
+    #[allow(dead_code)]
+    fn add_frame(&mut self, buf: NAVideoBuffer<u8>) {
+        self.lastframe = Some(buf);
+    }
+    #[allow(dead_code)]
+    fn clone_ref(&mut self) -> Option<NAVideoBuffer<u8>> {
+        if let Some(ref mut frm) = self.lastframe {
+            let newfrm = frm.copy_buffer();
+            *frm = newfrm.clone();
+            Some(newfrm)
+        } else {
+            None
+        }
+    }
+    #[allow(dead_code)]
+    fn get_output_frame(&mut self) -> Option<NAVideoBuffer<u8>> {
+        match self.lastframe {
+            Some(ref frm) => Some(frm.clone()),
+            None => None,
+        }
+    }
+}
+
 pub trait NADecoder {
     fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()>;
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<Rc<NAFrame>>;
+    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef>;
 }
 
 #[derive(Clone,Copy)]
-pub struct DemuxerInfo {
+pub struct DecoderInfo {
     name: &'static str,
     get_decoder: fn () -> Box<NADecoder>,
 }
 
-const DECODERS: &[DemuxerInfo] = &[
+const DECODERS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_indeo2")]
-    DemuxerInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
+    DecoderInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
+#[cfg(feature="decoder_pcm")]
+    DecoderInfo { name: "pcm", get_decoder: pcm::get_decoder },
 ];
 
 pub fn find_decoder(name: &str) -> Option<fn () -> Box<NADecoder>> {