more utility code for decoders

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

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 5a55ff7628bbb6a09499c933e09db69700e5ca8a..56cf023e50309c71f71ae2863ae9b1d09e82e106 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -47,6 +47,8 @@ struct AVIDemuxer<'a> {
     size:           usize,
     movi_size:      usize,
     sstate:         StreamState,
+    tb_num:         u32,
+    tb_den:         u32,
 }
 
 #[derive(Debug,Clone,Copy,PartialEq)]
@@ -76,6 +78,10 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
         if self.movi_size == 0 { return Err(EOF); }
         let mut tag: [u8; 4] = [0; 4];
         loop {
+            if (self.src.tell() & 1) == 1 {
+                self.src.read_skip(1)?;
+                self.movi_size -= 1;
+            }
             self.src.read_buf(&mut tag)?;
             let size = self.src.read_u32le()? as usize;
             if mktag!(tag) == mktag!(b"JUNK") {
@@ -90,7 +96,9 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
             let str = self.dmx.get_stream(stream_no as usize);
             if let None = str { return Err(InvalidData); }
             let stream = str.unwrap();
-            let pkt = self.src.read_packet(stream, Some(self.cur_frame[stream_no as usize]), None, None, false, size)?;
+            let (tb_num, tb_den) = stream.get_timebase();
+            let ts = NATimeInfo::new(Some(self.cur_frame[stream_no as usize]), None, None, tb_num, tb_den);
+            let pkt = self.src.read_packet(stream, ts, false, size)?;
             self.cur_frame[stream_no as usize] += 1;            
             self.movi_size -= size + 8;
 
@@ -115,6 +123,8 @@ impl<'a> AVIDemuxer<'a> {
             size: 0,
             movi_size: 0,
             sstate: StreamState::new(),
+            tb_num: 0,
+            tb_den: 0,
             dmx: Demuxer::new()
         }
     }
@@ -226,8 +236,8 @@ fn parse_strh(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     dmx.src.read_skip(2)?; //priority
     dmx.src.read_skip(2)?; //language
     dmx.src.read_skip(4)?; //initial frames
-    let scale = dmx.src.read_u32le()?; //scale
-    let rate = dmx.src.read_u32le()?; //rate
+    dmx.tb_num = dmx.src.read_u32le()?; //scale
+    dmx.tb_den = dmx.src.read_u32le()?; //rate
     dmx.src.read_skip(4)?; //start
     dmx.src.read_skip(4)?; //length
     dmx.src.read_skip(4)?; //buf size
@@ -291,7 +301,7 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
                     Some(name) => name,
                 };
     let vinfo = NACodecInfo::new(cname, vci, edata);
-    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Video, dmx.sstate.strm_no as u32, vinfo));
+    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Video, dmx.sstate.strm_no as u32, vinfo, dmx.tb_num, dmx.tb_den));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();
     Ok(size)
@@ -315,7 +325,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
                     Some(name) => name,
                 };
     let ainfo = NACodecInfo::new(cname, NACodecTypeInfo::Audio(ahdr), edata);
-    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Audio, dmx.sstate.strm_no as u32, ainfo));
+    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Audio, dmx.sstate.strm_no as u32, ainfo, dmx.tb_num, dmx.tb_den));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();
     Ok(size)
@@ -324,7 +334,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
 fn parse_strf_xxxx(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let edata = dmx.read_extradata(size)?;
     let info = NACodecInfo::new("unknown", NACodecTypeInfo::None, edata);
-    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Data, dmx.sstate.strm_no as u32, info));
+    let res = dmx.dmx.add_stream(NAStream::new(StreamType::Data, dmx.sstate.strm_no as u32, info, dmx.tb_num, dmx.tb_den));
     if let None = res { return Err(MemoryError); }
     dmx.sstate.reset();
     Ok(size)