X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-llaudio%2Fsrc%2Fdemuxers%2Fwavpack.rs;h=2d92e7b7f1fe3041bd33c0d2d12a5642b1e73cef;hb=8e14efb001fac3fecb0cb56df8705d23fa2231a8;hp=e54ad7e68a3bed760499dfbdbe2050f92680fa8e;hpb=95221ccc81e3bdad749a7aa49b48499c73fc699a;p=nihav.git diff --git a/nihav-llaudio/src/demuxers/wavpack.rs b/nihav-llaudio/src/demuxers/wavpack.rs index e54ad7e..2d92e7b 100644 --- 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(); - 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); @@ -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 (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); @@ -279,6 +277,7 @@ mod test { #[test] fn test_wavpack_demux() { + // sample from the official WavPack test samples set let mut file = File::open("assets/LLaudio/wv/false_stereo.wv").unwrap(); let mut fr = FileReader::new_read(&mut file); let mut br = ByteReader::new(&mut fr);