X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-llaudio%2Fsrc%2Fdemuxers%2Fwavpack.rs;h=6c5f8dd392b51d155abebc000ac519dc11439e36;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=9d010890ad88c5ae9987a624d4615c1c221a69cd;hpb=886cde4847280b96e10d240c2f2d76abec121dc8;p=nihav.git diff --git a/nihav-llaudio/src/demuxers/wavpack.rs b/nihav-llaudio/src/demuxers/wavpack.rs index 9d01089..6c5f8dd 100644 --- a/nihav-llaudio/src/demuxers/wavpack.rs +++ b/nihav-llaudio/src/demuxers/wavpack.rs @@ -36,6 +36,7 @@ struct WVHeader { const WV_HEADER_SIZE: usize = 32; impl WVHeader { + #[allow(clippy::field_reassign_with_default)] fn parse(src: &[u8]) -> DemuxerResult { let mut mr = MemoryReader::new_read(src); let mut br = ByteReader::new(&mut mr); @@ -189,8 +190,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 +205,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);