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
/
q.rs
diff --git
a/nihav-game/src/demuxers/q.rs
b/nihav-game/src/demuxers/q.rs
index 6c52ab893b74d7276302913170b5013fea65e43d..3735bfaf836f61f61e286c516b5f7b5883ce0c8b 100644
(file)
--- a/
nihav-game/src/demuxers/q.rs
+++ b/
nihav-game/src/demuxers/q.rs
@@
-82,8
+82,7
@@
impl<'a> DemuxCore<'a> for QDemuxer<'a> {
0 => {
if let Some(a_id) = self.a_id {
let str = strmgr.get_stream(a_id).unwrap();
0 => {
if let Some(a_id) = self.a_id {
let str = strmgr.get_stream(a_id).unwrap();
- let (tb_num, tb_den) = str.get_timebase();
- let ts = NATimeInfo::new(Some(self.apts), None, None, tb_num, tb_den);
+ let ts = str.make_ts(Some(self.apts), None, None);
self.apts += (size / self.bps) as u64;
return self.src.read_packet(str, ts, true, size);
} else {
self.apts += (size / self.bps) as u64;
return self.src.read_packet(str, ts, true, size);
} else {
@@
-101,8
+100,7
@@
impl<'a> DemuxCore<'a> for QDemuxer<'a> {
2 | 3 | 4 | 11 => {
validate!(self.v_id.is_some());
let str = strmgr.get_stream(self.v_id.unwrap_or(0)).unwrap();
2 | 3 | 4 | 11 => {
validate!(self.v_id.is_some());
let str = strmgr.get_stream(self.v_id.unwrap_or(0)).unwrap();
- let (tb_num, tb_den) = str.get_timebase();
- let ts = NATimeInfo::new(Some(self.vpts), None, None, tb_num, tb_den);
+ let ts = str.make_ts(Some(self.vpts), None, None);
self.vpts += 1;
let cur_len = self.side_data.len();
self.vpts += 1;
let cur_len = self.side_data.len();