X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fgdv.rs;h=8ae27c61b95376be112010c2262d1638cb41a9c5;hb=a970b2110488aeff5855743d1728ee83462e8306;hp=24a588694bea773776f7705c0be8c11666d5b00f;hpb=f84608b7a3c16f682ef9418feddf5b523799e053;p=nihav.git

diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs
index 24a5886..8ae27c6 100644
--- a/nihav-game/src/demuxers/gdv.rs
+++ b/nihav-game/src/demuxers/gdv.rs
@@ -91,7 +91,7 @@ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> {
             let ahdr = NAAudioInfo::new(u32::from(rate), channels as u8, if depth == 16 { SND_S16_FORMAT } else { SND_U8_FORMAT }, 2);
             let ainfo = NACodecInfo::new(if packed != 0 { "gdv-audio" } else { "pcm" },
                                          NACodecTypeInfo::Audio(ahdr), None);
-            self.a_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, u32::from(rate), 0));
+            self.a_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, u32::from(fps), 0));
 
             self.asize = (((rate / fps) * channels * (depth / 8)) >> packed) as usize;
             self.apacked = (aflags & 8) != 0;
@@ -142,14 +142,13 @@ pktdta: Vec::new(),
 
     fn read_achunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
         self.state = GDVState::AudioRead;
-        let str = strmgr.get_stream(self.a_id.unwrap()).unwrap();
-        let (tb_num, tb_den) = str.get_timebase();
-        let ts = NATimeInfo::new(Some(u64::from(self.cur_frame)), None, None, tb_num, tb_den);
-        self.src.read_packet(str, ts, true, self.asize)
+        let stream = strmgr.get_stream(self.a_id.unwrap()).unwrap();
+        let ts = stream.make_ts(Some(u64::from(self.cur_frame)), None, None);
+        self.src.read_packet(stream, ts, true, self.asize)
     }
 
     fn read_vchunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
-        let str = strmgr.get_stream(self.v_id.unwrap()).unwrap();
+        let stream = strmgr.get_stream(self.v_id.unwrap()).unwrap();
         let src = &mut self.src;
         let magic = src.read_u16be()?;
         if magic != 0x0513 { return Err(DemuxerError::InvalidData); }
@@ -158,9 +157,8 @@ pktdta: Vec::new(),
         let flags = (tmp & 0xFF) as usize;
         self.state = GDVState::NewFrame;
         self.cur_frame += 1;
-        let (tb_num, tb_den) = str.get_timebase();
-        let ts = NATimeInfo::new(Some(u64::from(self.cur_frame - 1)), None, None, tb_num, tb_den);
-        src.read_packet(str, ts, (flags & 64) != 0, size)
+        let ts = stream.make_ts(Some(u64::from(self.cur_frame - 1)), None, None);
+        src.read_packet(stream, ts, (flags & 64) != 0, size)
     }
 }
 
@@ -180,6 +178,7 @@ mod test {
 
     #[test]
     fn test_gdv_demux() {
+        // sample from Normality game
         let mut file = File::open("assets/Game/intro1.gdv").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);