X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fgdv.rs;fp=nihav-game%2Fsrc%2Fdemuxers%2Fgdv.rs;h=8ae27c61b95376be112010c2262d1638cb41a9c5;hp=876f3c16cb21dedaf468b1f7c4b1766ab7cf4040;hb=817e487223b28379176a533f09485c27a68443f8;hpb=8e14efb001fac3fecb0cb56df8705d23fa2231a8 diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs index 876f3c1..8ae27c6 100644 --- a/nihav-game/src/demuxers/gdv.rs +++ b/nihav-game/src/demuxers/gdv.rs @@ -142,13 +142,13 @@ pktdta: Vec::new(), fn read_achunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { self.state = GDVState::AudioRead; - let str = strmgr.get_stream(self.a_id.unwrap()).unwrap(); - let ts = str.make_ts(Some(u64::from(self.cur_frame)), None, None); - self.src.read_packet(str, ts, true, self.asize) + let stream = strmgr.get_stream(self.a_id.unwrap()).unwrap(); + let ts = stream.make_ts(Some(u64::from(self.cur_frame)), None, None); + self.src.read_packet(stream, ts, true, self.asize) } fn read_vchunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { - let str = strmgr.get_stream(self.v_id.unwrap()).unwrap(); + let stream = strmgr.get_stream(self.v_id.unwrap()).unwrap(); let src = &mut self.src; let magic = src.read_u16be()?; if magic != 0x0513 { return Err(DemuxerError::InvalidData); } @@ -157,8 +157,8 @@ pktdta: Vec::new(), let flags = (tmp & 0xFF) as usize; self.state = GDVState::NewFrame; self.cur_frame += 1; - let ts = str.make_ts(Some(u64::from(self.cur_frame - 1)), None, None); - src.read_packet(str, ts, (flags & 64) != 0, size) + let ts = stream.make_ts(Some(u64::from(self.cur_frame - 1)), None, None); + src.read_packet(stream, ts, (flags & 64) != 0, size) } }