projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch demuxers to use NAStream::make_ts()
[nihav.git]
/
nihav-game
/
src
/
demuxers
/
gdv.rs
diff --git
a/nihav-game/src/demuxers/gdv.rs
b/nihav-game/src/demuxers/gdv.rs
index 8f54bca750d55779614926074b962f70ca6ce6fb..876f3c16cb21dedaf468b1f7c4b1766ab7cf4040 100644
(file)
--- 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<NAPacket> {
self.state = GDVState::AudioRead;
let str = strmgr.get_stream(self.a_id.unwrap()).unwrap();
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);
+ let ts = str.make_ts(Some(u64::from(self.cur_frame)), None, None);
self.src.read_packet(str, ts, true, self.asize)
}
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 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)
}
}
src.read_packet(str, ts, (flags & 64) != 0, size)
}
}