initial seeking support

[nihav.git] / nihav-game / src / demuxers / vmd.rs

diff --git a/nihav-game/src/demuxers/vmd.rs b/nihav-game/src/demuxers/vmd.rs
index a41967e2c9aa642768b2b37d3100926c60d1dc8e..0c47f89cf5600438a28b360fca0c2739640bc9ab 100644 (file)
--- a/nihav-game/src/demuxers/vmd.rs
+++ b/nihav-game/src/demuxers/vmd.rs
@@ -28,7 +28,7 @@ struct VMDDemuxer<'a> {
 
 impl<'a> DemuxCore<'a> for VMDDemuxer<'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 mut header: [u8; HEADER_SIZE] = [0; HEADER_SIZE];
@@ -53,7 +53,7 @@ impl<'a> DemuxCore<'a> for VMDDemuxer<'a> {
         let vinfo = NACodecInfo::new(if !self.is_indeo { "vmd-video" } else { "indeo3" }, vci, Some(edata));
         self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, 12)).unwrap();
 
-        let srate = read_u16le(&header[804..])? as u32;
+        let srate = u32::from(read_u16le(&header[804..])?);
         let block_size;
         if srate > 0 {
             let bsize = read_u16le(&header[806..])? as usize;
@@ -74,8 +74,8 @@ impl<'a> DemuxCore<'a> for VMDDemuxer<'a> {
             block_size = 0;
         }
 
-        let adelay  = read_u16le(&header[808..])? as u32;
-        let idx_off = read_u32le(&header[812..])? as u64;
+        let adelay  = u32::from(read_u16le(&header[808..])?);
+        let idx_off = u64::from(read_u32le(&header[812..])?);
                                                 src.seek(SeekFrom::Start(idx_off))?;
         let mut offs: Vec<u32> = Vec::with_capacity(nframes);
         for i in 0..nframes {
@@ -122,7 +122,7 @@ impl<'a> DemuxCore<'a> for VMDDemuxer<'a> {
         if self.fno >= self.frames.len() { return Err(DemuxerError::EOF); }
         let cur_frame = &self.frames[self.fno];
 //println!("fno {} -> type {} size {} @ {:X} ts {}", self.fno, cur_frame.chtype, cur_frame.size, cur_frame.off, cur_frame.ts);
-        let next_pos = cur_frame.off as u64;
+        let next_pos = u64::from(cur_frame.off);
         if self.src.tell() != next_pos {
             self.src.seek(SeekFrom::Start(next_pos))?;
         }
@@ -143,15 +143,14 @@ impl<'a> DemuxCore<'a> for VMDDemuxer<'a> {
         let str_id = if is_video { self.vid_id } else { self.aud_id };
         let str = strmgr.get_stream(str_id).unwrap();
         let (tb_num, tb_den) = str.get_timebase();
-        let ts = NATimeInfo::new(Some(cur_frame.ts as u64), None, None, tb_num, tb_den);
+        let ts = NATimeInfo::new(Some(u64::from(cur_frame.ts)), None, None, tb_num, tb_den);
         let pkt = NAPacket::new(str, ts, false, buf);
 
         Ok(pkt)
     }
 
-    #[allow(unused_variables)]
-    fn seek(&mut self, time: u64) -> DemuxerResult<()> {
-        Err(DemuxerError::NotImplemented)
+    fn seek(&mut self, _time: u64, _seek_index: &SeekIndex) -> DemuxerResult<()> {
+        Err(DemuxerError::NotPossible)
     }
 }
 
@@ -171,7 +170,7 @@ impl<'a> VMDDemuxer<'a> {
 pub struct VMDDemuxerCreator { }
 
 impl DemuxerCreator for VMDDemuxerCreator {
-    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
         Box::new(VMDDemuxer::new(br))
     }
     fn get_name(&self) -> &'static str { "vmd" }
@@ -184,8 +183,8 @@ mod test {
 
     #[test]
     fn test_vmd_demux() {
-        let mut file = File::open("assets/128.vmd").unwrap();
-        //let mut file = File::open("assets/1491.VMD").unwrap();
+        let mut file = File::open("assets/Game/128.vmd").unwrap();
+        //let mut file = File::open("assets/Game/1491.VMD").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);
         let mut dmx = VMDDemuxer::new(&mut br);