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
/
hl_fmv.rs
diff --git
a/nihav-game/src/demuxers/hl_fmv.rs
b/nihav-game/src/demuxers/hl_fmv.rs
index b511bb96aa4ffd064d000fc79e183acb4cdaa6e8..20a8767984fc254333b60fbb246a538440f4ff2c 100644
(file)
--- a/
nihav-game/src/demuxers/hl_fmv.rs
+++ b/
nihav-game/src/demuxers/hl_fmv.rs
@@
-41,15
+41,13
@@
impl<'a> DemuxCore<'a> for HighlanderFMVDemuxer<'a> {
match &tag {
b"AUD1" => {
let stream = strmgr.get_stream_by_id(1).unwrap();
match &tag {
b"AUD1" => {
let stream = strmgr.get_stream_by_id(1).unwrap();
- let (tb_num, tb_den) = stream.get_timebase();
- let ts = NATimeInfo::new(Some(self.apts), None, None, tb_num, tb_den);
+ let ts = stream.make_ts(Some(self.apts), None, None);
self.apts += size as u64;
self.src.read_packet(stream, ts, true, size)
},
b"VID3" => {
let stream = strmgr.get_stream_by_id(0).unwrap();
self.apts += size as u64;
self.src.read_packet(stream, ts, true, size)
},
b"VID3" => {
let stream = strmgr.get_stream_by_id(0).unwrap();
- let (tb_num, tb_den) = stream.get_timebase();
- let ts = NATimeInfo::new(Some(self.vpts), None, None, tb_num, tb_den);
+ let ts = stream.make_ts(Some(self.vpts), None, None);
self.vpts += 1;
self.src.read_packet(stream, ts, true, size)
},
self.vpts += 1;
self.src.read_packet(stream, ts, true, size)
},