X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fbmv.rs;h=f548fdc7593cbd82e1038b182e87cf4591dc8b1c;hp=6ef023ba58946bdabfc7066df9ce4eda67cf885f;hb=a480a0de101483d802a11e72d758dae00fa4860a;hpb=6011e20199143f519881660144a4ca95ba77fd2d

diff --git a/nihav-game/src/demuxers/bmv.rs b/nihav-game/src/demuxers/bmv.rs
index 6ef023b..f548fdc 100644
--- a/nihav-game/src/demuxers/bmv.rs
+++ b/nihav-game/src/demuxers/bmv.rs
@@ -12,17 +12,17 @@ struct BMVDemuxer<'a> {
 
 impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
     #[allow(unused_variables)]
-    fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
+    fn open(&mut self, strmgr: &mut StreamManager, _seek_index: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
 
         let vhdr = NAVideoInfo::new(640, 429, false, PAL8_FORMAT);
         let vci = NACodecTypeInfo::Video(vhdr);
         let vinfo = NACodecInfo::new("bmv-video", vci, None);
-        self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, 12)).unwrap();
+        self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, 12, 0)).unwrap();
 
         let ahdr = NAAudioInfo::new(22050, 2, SND_S16_FORMAT, 1);
         let ainfo = NACodecInfo::new("bmv-audio", NACodecTypeInfo::Audio(ahdr), None);
-        self.aud_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, 22050)).unwrap();
+        self.aud_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, 22050, 0)).unwrap();
 
         self.vpos       = 0;
         self.apos       = 0;
@@ -30,7 +30,7 @@ impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
     }
 
     fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
-        if self.pkt_buf.len() > 0 {
+        if !self.pkt_buf.is_empty() {
             return Ok(self.pkt_buf.pop().unwrap());
         }
 
@@ -51,13 +51,12 @@ impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
                 let (tb_num, tb_den) = str.get_timebase();
                 let ts = NATimeInfo::new(Some(self.apos), None, None, tb_num, tb_den);
                 let apkt = self.src.read_packet(str, ts, false, asize)?;
-                self.apos += (nblocks as u64) * 32;
+                self.apos += u64::from(nblocks) * 32;
                 self.pkt_buf.push(apkt);
             } else {
                 asize = 0;
             }
-            let mut buf: Vec<u8> = Vec::with_capacity(size - asize + 1);
-            buf.resize(size - asize + 1, 0);
+            let mut buf: Vec<u8> = vec![0; size - asize + 1];
             buf[0] = ctype;
             self.src.read_buf(&mut buf[1..])?;
 
@@ -71,10 +70,16 @@ impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
         }
     }
 
-    #[allow(unused_variables)]
-    fn seek(&mut self, time: u64) -> DemuxerResult<()> {
-        Err(DemuxerError::NotImplemented)
+    fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
+        Err(DemuxerError::NotPossible)
     }
+    fn get_duration(&self) -> u64 { 0 }
+}
+
+impl<'a> NAOptionHandler for BMVDemuxer<'a> {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
 
 impl<'a> BMVDemuxer<'a> {
@@ -112,7 +117,8 @@ struct BMV3Demuxer<'a> {
 
 impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
     #[allow(unused_variables)]
-    fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
+    #[allow(clippy::cast_lossless)]
+    fn open(&mut self, strmgr: &mut StreamManager, _seek_index: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
 
         let mut magic = [0u8; 4];
@@ -146,11 +152,11 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
         let vhdr = NAVideoInfo::new(width, height, false, RGB565_FORMAT);
         let vci = NACodecTypeInfo::Video(vhdr);
         let vinfo = NACodecInfo::new("bmv3-video", vci, None);
-        self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 256, fps)).unwrap();
+        self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 256, fps, nframes as u64)).unwrap();
 
         let ahdr = NAAudioInfo::new(22050, 2, SND_S16_FORMAT, audio_blob_size);
         let ainfo = NACodecInfo::new("bmv3-audio", NACodecTypeInfo::Audio(ahdr), None);
-        self.aud_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, 22050)).unwrap();
+        self.aud_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, 22050, 0)).unwrap();
 
         self.vpos       = 0;
         self.apos       = 0;
@@ -158,7 +164,7 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
     }
 
     fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
-        if self.pkt_buf.len() > 0 {
+        if !self.pkt_buf.is_empty() {
             return Ok(self.pkt_buf.pop().unwrap());
         }
 
@@ -178,8 +184,7 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
                     asize = self.asize;
                 }
                 validate!(asize <= size);
-                let mut buf: Vec<u8> = Vec::with_capacity(asize + 1);
-                buf.resize(asize + 1, 0);
+                let mut buf: Vec<u8> = vec![0; asize + 1];
                 buf[0] = (self.src.tell() & 1) as u8;
                 self.src.read_buf(&mut buf[1..])?;
 
@@ -194,14 +199,13 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
                 asize = 0;
             }
             if size == asize {
-                if self.pkt_buf.len() > 0 {
+                if !self.pkt_buf.is_empty() {
                     return Ok(self.pkt_buf.pop().unwrap());
                 } else {
                     continue;
                 }
             }
-            let mut buf: Vec<u8> = Vec::with_capacity(size - asize + 1);
-            buf.resize(size - asize + 1, 0);
+            let mut buf: Vec<u8> = vec![0; size - asize + 1];
             buf[0] = ctype;
             self.src.read_buf(&mut buf[1..])?;
 
@@ -215,10 +219,16 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
         }
     }
 
-    #[allow(unused_variables)]
-    fn seek(&mut self, time: u64) -> DemuxerResult<()> {
-        Err(DemuxerError::NotImplemented)
+    fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
+        Err(DemuxerError::NotPossible)
     }
+    fn get_duration(&self) -> u64 { 0 }
+}
+
+impl<'a> NAOptionHandler for BMV3Demuxer<'a> {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
 
 impl<'a> BMV3Demuxer<'a> {
@@ -257,7 +267,8 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = BMVDemuxer::new(&mut br);
         let mut sm = StreamManager::new();
-        dmx.open(&mut sm).unwrap();
+        let mut si = SeekIndex::new();
+        dmx.open(&mut sm, &mut si).unwrap();
         loop {
             let pktres = dmx.get_frame(&mut sm);
             if let Err(e) = pktres {
@@ -275,7 +286,8 @@ mod test {
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = BMV3Demuxer::new(&mut br);
         let mut sm = StreamManager::new();
-        dmx.open(&mut sm).unwrap();
+        let mut si = SeekIndex::new();
+        dmx.open(&mut sm, &mut si).unwrap();
         loop {
             let pktres = dmx.get_frame(&mut sm);
             if let Err(e) = pktres {