X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fgdv.rs;h=876f3c16cb21dedaf468b1f7c4b1766ab7cf4040;hb=8e14efb001fac3fecb0cb56df8705d23fa2231a8;hp=de4e9934a88cb6c6d4bc45d7322b566aa4a89f9c;hpb=8c53a0966102af7c6d37ab24181a90f8ede02566;p=nihav.git diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs index de4e993..876f3c1 100644 --- a/nihav-game/src/demuxers/gdv.rs +++ b/nihav-game/src/demuxers/gdv.rs @@ -143,8 +143,7 @@ pktdta: Vec::new(), fn read_achunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { 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); + let ts = str.make_ts(Some(u64::from(self.cur_frame)), None, None); self.src.read_packet(str, ts, true, self.asize) } @@ -158,8 +157,7 @@ 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); + let ts = str.make_ts(Some(u64::from(self.cur_frame - 1)), None, None); src.read_packet(str, 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);