X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=d0ae143ac9b7d7e827a5105a95e4aa0b3723261d;hb=4cfb5dd496118a94b7b59b806f0b81a17e47630c;hp=29427af1bab54b6df777cca6b2c9e1801cb58641;hpb=7e6086e50dce8780e59c8d9c0d2d74aa25aaae9e;p=nihav.git

diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs
index 29427af..d0ae143 100644
--- a/nihav-rad/src/demuxers/bink.rs
+++ b/nihav-rad/src/demuxers/bink.rs
@@ -49,7 +49,7 @@ macro_rules! mktag {
 }
 
 impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
-    fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> {
+    fn open(&mut self, strmgr: &mut StreamManager, seek_idx: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
         let mut magic: [u8; 4] = [0; 4];
                                               src.read_buf(&mut magic)?;
@@ -97,12 +97,19 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
             let _trk_id                     = src.read_u32le()?;
         }
 
+        seek_idx.mode = SeekIndexMode::Present;
+        seek_idx.add_stream(0);
         self.frame_pos = Vec::with_capacity(self.frames + 1);
-        for _ in 0..=self.frames {
+        for fno in 0..=self.frames {
             let pos                         = src.read_u32le()?;
             self.frame_pos.push(pos);
+            if (pos & 1) != 0 {
+                let time = (fno as u64) * 1000 * (tb_num as u64) / (tb_den as u64);
+                seek_idx.seek_info[0].add_entry(SeekEntry { time, pts: fno as u64, pos: (pos & !1) as u64 });
+            }
         }
         validate!((src.tell() as u32) == (self.frame_pos[0] & !1));
+        seek_idx.seek_info[0].filled = true;
 
         self.cur_frame = 0;
         
@@ -143,9 +150,16 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
 
         Ok(pkt)
     }
-    #[allow(unused_variables)]
-    fn seek(&mut self, time: u64) -> DemuxerResult<()> {
-        Err(DemuxerError::NotImplemented)
+    fn seek(&mut self, time: u64, seek_idx: &SeekIndex) -> DemuxerResult<()> {
+        let ret = seek_idx.find_pos(time);
+        if ret.is_none() {
+            return Err(DemuxerError::SeekError);
+        }
+        let seek_info = ret.unwrap();
+        self.src.seek(SeekFrom::Start(seek_info.pos))?;
+        self.queued_packets.clear();
+        self.cur_frame = seek_info.pts as usize;
+        Ok(())
     }
 }