X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=2d2a261f591bd2c968b3a9ad774a872d7ddae7d3;hb=cf64af13518ee281beec24f32aa0e36317260b82;hp=034ef70e31e3f574f9bc3e882296399b51f561f7;hpb=6611650404a13bca86a311afdc314406e725897c;p=nihav.git diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs index 034ef70..2d2a261 100644 --- 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, @@ -47,6 +47,8 @@ pub 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; @@ -106,7 +114,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, @@ -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() } } @@ -129,7 +139,8 @@ impl<'a> AVIDemuxer<'a> { if RIFFTag::Chunk(tag) == end_tag { return Ok((size, true)); } - let ltag = if is_list_tag(tag) { self.src.read_u32be()? } else { 0 }; + let is_list = is_list_tag(tag); + let ltag = if is_list { self.src.read_u32be()? } else { 0 }; if RIFFTag::List(tag, ltag) == end_tag { return Ok((size, true)); } @@ -138,6 +149,7 @@ impl<'a> AVIDemuxer<'a> { if RIFFTag::Chunk(tag) == CHUNKS[i].tag { let psize = (CHUNKS[i].parse)(self, size)?; if psize != size { return Err(InvalidData); } + if (psize & 1) == 1 { self.src.read_skip(1)?; } return Ok((size + 8, false)); } if RIFFTag::List(tag, ltag) == CHUNKS[i].tag { @@ -149,12 +161,23 @@ impl<'a> AVIDemuxer<'a> { let (psize, _) = self.parse_chunk(end_tag, rest_size, depth+1)?; if psize > rest_size { return Err(InvalidData); } rest_size -= psize; + if (psize & 1) == 1 { + if rest_size > 0 { + rest_size -= 1; + } + } } return Ok((size + 8, false)); } } - self.src.read_skip(size)?; + if !is_list { + self.src.read_skip(size)?; + } else { + if size < 4 { return Err(InvalidData); } + self.src.read_skip(size - 4)?; + } + if (size & 1) == 1 { self.src.read_skip(1)?; } return Ok((size + 8, false)); } @@ -226,8 +249,8 @@ fn parse_strh(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { 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 +314,7 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { 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 +338,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { 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 +347,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { fn parse_strf_xxxx(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { 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) @@ -358,6 +381,15 @@ fn parse_junk(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { Ok(size) } +pub struct AVIDemuxerCreator { } + +impl DemuxerCreator for AVIDemuxerCreator { + fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box + 'a> { + Box::new(AVIDemuxer::new(br)) + } + fn get_name(&self) -> &'static str { "avi" } +} + #[cfg(test)] mod test { use super::*; @@ -374,7 +406,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();