use frame buffers with codec-specific type of data

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

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 0b8ade0d5dc4b60114ca706105ffaddfdc6e019d..5a55ff7628bbb6a09499c933e09db69700e5ca8a 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -38,7 +38,7 @@ impl StreamState {
 }
 
 #[allow(dead_code)]
-pub struct AVIDemuxer<'a> {
+struct AVIDemuxer<'a> {
     opened:         bool,
     src:            &'a mut ByteReader<'a>,
     cur_frame:      Vec<u64>,
@@ -68,6 +68,9 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
         Ok(())
     }
 
+    fn get_num_streams(&self) -> usize { self.dmx.get_num_streams() }
+    fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>> { self.dmx.get_stream(idx) }
+
     fn get_frame(&mut self) -> DemuxerResult<NAPacket> {
         if !self.opened { return Err(NoSuchInput); }
         if self.movi_size == 0 { return Err(EOF); }
@@ -103,7 +106,7 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
 }
 
 impl<'a> AVIDemuxer<'a> {
-    pub fn new(io: &'a mut ByteReader<'a>) -> Self {
+    fn new(io: &'a mut ByteReader<'a>) -> Self {
         AVIDemuxer {
             cur_frame: Vec::new(),
             num_streams: 0,
@@ -280,7 +283,7 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
 
     let flip = height < 0;
     let format = if bitcount > 8 { RGB24_FORMAT } else { PAL8_FORMAT };
-    let vhdr = NAVideoInfo::new(width, if flip { -height as u32 } else { height as u32}, flip, PAL8_FORMAT);
+    let vhdr = NAVideoInfo::new(width as usize, if flip { -height as usize } else { height as usize}, flip, PAL8_FORMAT);
     let vci = NACodecTypeInfo::Video(vhdr);
     let edata = dmx.read_extradata(size - 40)?;
     let cname = match register::find_codec_from_avi_fourcc(&compression) {
@@ -355,6 +358,15 @@ fn parse_junk(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     Ok(size)
 }
 
+pub struct AVIDemuxerCreator { }
+
+impl DemuxerCreator for AVIDemuxerCreator {
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<Demux<'a> + 'a> {
+        Box::new(AVIDemuxer::new(br))
+    }
+    fn get_name(&self) -> &'static str { "avi" }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -371,7 +383,7 @@ mod test {
         loop {
             let pktres = dmx.get_frame();
             if let Err(e) = pktres {
-                if (e as i32) == (DemuxerError::EOF as i32) { break; }
+                if e == DemuxerError::EOF { break; }
                 panic!("error");
             }
             let pkt = pktres.unwrap();