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
/
imax.rs
diff --git
a/nihav-game/src/demuxers/imax.rs
b/nihav-game/src/demuxers/imax.rs
index a477ebe757ec7726cb1afd8c51542e067414a1f4..2cd9f70c3807a7975890aff93de03e17c27cd2cc 100644
(file)
--- a/
nihav-game/src/demuxers/imax.rs
+++ b/
nihav-game/src/demuxers/imax.rs
@@
-49,8
+49,7
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
match ftype {
0xAA97 => {
let str = strmgr.get_stream(self.v_id).unwrap();
match ftype {
0xAA97 => {
let str = strmgr.get_stream(self.v_id).unwrap();
- let (tb_num, tb_den) = str.get_timebase();
- let ts = NATimeInfo::new(Some(self.cur_frame), None, None, tb_num, tb_den);
+ let ts = str.make_ts(Some(self.cur_frame), None, None);
self.cur_frame += 1;
let mut pkt = self.src.read_packet(str, ts, true, fsize)?;
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
self.cur_frame += 1;
let mut pkt = self.src.read_packet(str, ts, true, fsize)?;
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
@@
-73,8
+72,7
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
},
0xAA99 => {
let str = strmgr.get_stream(self.a_id).unwrap();
},
0xAA99 => {
let str = strmgr.get_stream(self.a_id).unwrap();
- let (tb_num, tb_den) = str.get_timebase();
- let ts = NATimeInfo::new(Some(self.apos), None, None, tb_num, tb_den);
+ let ts = str.make_ts(Some(self.apos), None, None);
self.apos += fsize as u64;
return self.src.read_packet(str, ts, true, fsize);
},
self.apos += fsize as u64;
return self.src.read_packet(str, ts, true, fsize);
},