demuxer: use new interface

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

diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs
index aaf92e4cf36d421b8eeb3befabb7e2aa20a884cd..eb75d5711b4d66597af8573dbb8851e2a68e41c4 100644 (file)
--- a/src/demuxers/mod.rs
+++ b/src/demuxers/mod.rs
@@ -1,7 +1,7 @@
 #[cfg(feature="demuxer_gdv")]
-pub mod gdv;
+mod gdv;
 #[cfg(feature="demuxer_avi")]
-pub mod avi;
+mod avi;
 
 use std::rc::Rc;
 use frame::*;
@@ -20,11 +20,9 @@ pub enum DemuxerError {
 
 type DemuxerResult<T> = Result<T, DemuxerError>;
 
-pub trait Demux<'a> {
-    fn open(&mut self) -> DemuxerResult<()>;
-    fn get_num_streams(&self) -> usize;
-    fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>>;
-    fn get_frame(&mut self) -> DemuxerResult<NAPacket>;
+pub trait DemuxCore<'a> {
+    fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()>;
+    fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket>;
     fn seek(&mut self, time: u64) -> DemuxerResult<()>;
 }
 
@@ -52,17 +50,28 @@ impl<'a> NAPacketReader for ByteReader<'a> {
     }
 }
 
-struct Demuxer {
+pub struct StreamManager {
     streams: Vec<Rc<NAStream>>,
+    ignored: Vec<bool>,
+    no_ign:  bool,
 }
 
-impl Demuxer {
-    pub fn new() -> Self { Demuxer { streams: Vec::new() } }
+impl StreamManager {
+    pub fn new() -> Self {
+        StreamManager {
+            streams: Vec::new(),
+            ignored: Vec::new(),
+            no_ign:  true,
+        }
+    }
+    pub fn iter(&self) -> StreamIter { StreamIter::new(&self.streams) }
+
     pub fn add_stream(&mut self, stream: NAStream) -> Option<usize> {
         let stream_num = self.streams.len();
         let mut str = stream.clone();
         str.set_num(stream_num);
         self.streams.push(Rc::new(str));
+        self.ignored.push(false);
         Some(stream_num)
     }
     pub fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>> {
@@ -72,7 +81,6 @@ impl Demuxer {
             None
         }
     }
-    #[allow(dead_code)]
     pub fn get_stream_by_id(&self, id: u32) -> Option<Rc<NAStream>> {
         for i in 0..self.streams.len() {
             if self.streams[i].get_id() == id {
@@ -82,6 +90,98 @@ impl Demuxer {
         None
     }
     pub fn get_num_streams(&self) -> usize { self.streams.len() }
+    pub fn is_ignored(&self, idx: usize) -> bool {
+        if self.no_ign {
+            true
+        } else if idx < self.ignored.len() {
+            self.ignored[idx]
+        } else {
+            false
+        }
+    }
+    pub fn set_ignored(&mut self, idx: usize) {
+        if idx < self.ignored.len() {
+            self.ignored[idx] = true;
+            self.no_ign = false;
+        }
+    }
+    pub fn set_unignored(&mut self, idx: usize) {
+        if idx < self.ignored.len() {
+            self.ignored[idx] = false;
+        }
+    }
+}
+
+pub struct StreamIter<'a> {
+    streams:    &'a Vec<Rc<NAStream>>,
+    pos:        usize,
+}
+
+impl<'a> StreamIter<'a> {
+    pub fn new(streams: &'a Vec<Rc<NAStream>>) -> Self {
+        StreamIter { streams: streams, pos: 0 }
+    }
+}
+
+impl<'a> Iterator for StreamIter<'a> {
+    type Item = Rc<NAStream>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.pos >= self.streams.len() { return None; }
+        let ret = self.streams[self.pos].clone();
+        self.pos += 1;
+        Some(ret)
+    }
+}
+
+pub struct Demuxer<'a> {
+    dmx:        Box<DemuxCore<'a> + 'a>,
+    streams:    StreamManager,
+}
+
+impl<'a> Demuxer<'a> {
+    fn new(dmx: Box<DemuxCore<'a> + 'a>, str: StreamManager) -> Self {
+        Demuxer {
+            dmx:        dmx,
+            streams:    str,
+        }
+    }
+    pub fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>> {
+        self.streams.get_stream(idx)
+    }
+    pub fn get_stream_by_id(&self, id: u32) -> Option<Rc<NAStream>> {
+        self.streams.get_stream_by_id(id)
+    }
+    pub fn get_num_streams(&self) -> usize {
+        self.streams.get_num_streams()
+    }
+    pub fn get_streams(&self) -> StreamIter {
+        self.streams.iter()
+    }
+    pub fn is_ignored_stream(&self, idx: usize) -> bool {
+        self.streams.is_ignored(idx)
+    }
+    pub fn set_ignored_stream(&mut self, idx: usize) {
+        self.streams.set_ignored(idx)
+    }
+    pub fn set_unignored_stream(&mut self, idx: usize) {
+        self.streams.set_unignored(idx)
+    }
+
+    pub fn get_frame(&mut self) -> DemuxerResult<NAPacket> {
+        loop {
+            let res = self.dmx.get_frame(&mut self.streams);
+            if self.streams.no_ign || res.is_err() { return res; }
+            let res = res.unwrap();
+            let idx = res.get_stream().get_num();
+            if !self.is_ignored_stream(idx) {
+                return Ok(res);
+            }
+        }
+    }
+    pub fn seek(&mut self, time: u64) -> DemuxerResult<()> {
+        self.dmx.seek(time)
+    }
 }
 
 impl From<ByteIOError> for DemuxerError {
@@ -91,7 +191,7 @@ impl From<ByteIOError> for DemuxerError {
 ///The structure used to create demuxers.
 pub trait DemuxerCreator {
     /// Create new demuxer instance that will use `ByteReader` source as an input.
-    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<Demux<'a> + 'a>;
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a>;
     /// Get the name of current demuxer creator.
     fn get_name(&self) -> &'static str;
 }
@@ -111,3 +211,10 @@ pub fn find_demuxer(name: &str) -> Option<&DemuxerCreator> {
     }
     None
 }
+
+pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
+    let mut dmx = dmxcr.new_demuxer(br);
+    let mut str = StreamManager::new();
+    dmx.open(&mut str)?;    
+    Ok(Demuxer::new(dmx, str))
+}