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-llaudio
/
src
/
demuxers
/
wavpack.rs
diff --git
a/nihav-llaudio/src/demuxers/wavpack.rs
b/nihav-llaudio/src/demuxers/wavpack.rs
index 9d010890ad88c5ae9987a624d4615c1c221a69cd..2d92e7b7f1fe3041bd33c0d2d12a5642b1e73cef 100644
(file)
--- a/
nihav-llaudio/src/demuxers/wavpack.rs
+++ b/
nihav-llaudio/src/demuxers/wavpack.rs
@@
-189,8
+189,7
@@
impl<'a> DemuxCore<'a> for WavPackDemuxer<'a> {
std::mem::swap(&mut fb, &mut self.first_blocks);
let (refhdr, buf) = fb.unwrap();
let stream = strmgr.get_stream(0).unwrap();
std::mem::swap(&mut fb, &mut self.first_blocks);
let (refhdr, buf) = fb.unwrap();
let stream = strmgr.get_stream(0).unwrap();
- let (tb_num, tb_den) = stream.get_timebase();
- let ts = NATimeInfo::new(Some(self.samplepos), None, None, tb_num, tb_den);
+ let ts = stream.make_ts(Some(self.samplepos), None, None);
let pkt = NAPacket::new(stream, ts, true, buf);
self.samplepos += u64::from(refhdr.block_samples);
let pkt = NAPacket::new(stream, ts, true, buf);
self.samplepos += u64::from(refhdr.block_samples);
@@
-205,8
+204,7
@@
impl<'a> DemuxCore<'a> for WavPackDemuxer<'a> {
let (refhdr, buf) = self.read_blocks()?;
let stream = strmgr.get_stream(0).unwrap();
let (refhdr, buf) = self.read_blocks()?;
let stream = strmgr.get_stream(0).unwrap();
- let (tb_num, tb_den) = stream.get_timebase();
- let ts = NATimeInfo::new(Some(self.samplepos), None, None, tb_num, tb_den);
+ let ts = stream.make_ts(Some(self.samplepos), None, None);
let pkt = NAPacket::new(stream, ts, true, buf);
self.samplepos += u64::from(refhdr.block_samples);
let pkt = NAPacket::new(stream, ts, true, buf);
self.samplepos += u64::from(refhdr.block_samples);