diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2019-11-13 19:41:45 +0100 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2019-11-13 19:41:45 +0100 |
commit | 33b5a8f0020ee3e6e0cc39ba9f6219965502df84 (patch) | |
tree | 549da6d6386f7ed41c07fca5e7e00cf068406704 /nihav-game/src/demuxers | |
parent | 266da7b9db18727dc065a4e8971ecb0ac0b1e45f (diff) | |
download | nihav-33b5a8f0020ee3e6e0cc39ba9f6219965502df84.tar.gz |
initial seeking support
Diffstat (limited to 'nihav-game/src/demuxers')
-rw-r--r-- | nihav-game/src/demuxers/bmv.rs | 14 | ||||
-rw-r--r-- | nihav-game/src/demuxers/gdv.rs | 7 | ||||
-rw-r--r-- | nihav-game/src/demuxers/vmd.rs | 7 |
3 files changed, 12 insertions, 16 deletions
diff --git a/nihav-game/src/demuxers/bmv.rs b/nihav-game/src/demuxers/bmv.rs index afb1731..44e9193 100644 --- a/nihav-game/src/demuxers/bmv.rs +++ b/nihav-game/src/demuxers/bmv.rs @@ -12,7 +12,7 @@ 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); @@ -70,9 +70,8 @@ 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: u64, _seek_index: &SeekIndex) -> DemuxerResult<()> { + Err(DemuxerError::NotPossible) } } @@ -111,7 +110,7 @@ struct BMV3Demuxer<'a> { impl<'a> DemuxCore<'a> for BMV3Demuxer<'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 magic = [0u8; 4]; @@ -212,9 +211,8 @@ 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: u64, _seek_index: &SeekIndex) -> DemuxerResult<()> { + Err(DemuxerError::NotPossible) } } diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs index 6f27cc4..b70e344 100644 --- a/nihav-game/src/demuxers/gdv.rs +++ b/nihav-game/src/demuxers/gdv.rs @@ -48,7 +48,7 @@ const GDV_SIZE_TABLE: &[GDVFixedSizes] = &[ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'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 magic = src.read_u32le()?; if magic != 0x29111994 { return Err(DemuxerError::InvalidData); } @@ -110,9 +110,8 @@ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> { } } - #[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) } } /*impl<'a> Drop for GremlinVideoDemuxer<'a> { diff --git a/nihav-game/src/demuxers/vmd.rs b/nihav-game/src/demuxers/vmd.rs index cc4ac0e..0c47f89 100644 --- 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]; @@ -149,9 +149,8 @@ impl<'a> DemuxCore<'a> for VMDDemuxer<'a> { 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) } } |