X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fq.rs;fp=nihav-game%2Fsrc%2Fdemuxers%2Fq.rs;h=071f00f17f288a054b9e654af75a74a8af7620e6;hp=3735bfaf836f61f61e286c516b5f7b5883ce0c8b;hb=817e487223b28379176a533f09485c27a68443f8;hpb=8e14efb001fac3fecb0cb56df8705d23fa2231a8 diff --git a/nihav-game/src/demuxers/q.rs b/nihav-game/src/demuxers/q.rs index 3735bfa..071f00f 100644 --- a/nihav-game/src/demuxers/q.rs +++ b/nihav-game/src/demuxers/q.rs @@ -81,10 +81,10 @@ impl<'a> DemuxCore<'a> for QDemuxer<'a> { 0xFFFF => return Err(DemuxerError::EOF), 0 => { if let Some(a_id) = self.a_id { - let str = strmgr.get_stream(a_id).unwrap(); - let ts = str.make_ts(Some(self.apts), None, None); + let stream = strmgr.get_stream(a_id).unwrap(); + let ts = stream.make_ts(Some(self.apts), None, None); self.apts += (size / self.bps) as u64; - return self.src.read_packet(str, ts, true, size); + return self.src.read_packet(stream, ts, true, size); } else { self.src.read_skip(size)?; } @@ -99,8 +99,8 @@ 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(); - let ts = str.make_ts(Some(self.vpts), None, None); + let stream = strmgr.get_stream(self.v_id.unwrap_or(0)).unwrap(); + let ts = stream.make_ts(Some(self.vpts), None, None); self.vpts += 1; let cur_len = self.side_data.len(); @@ -114,7 +114,7 @@ impl<'a> DemuxCore<'a> for QDemuxer<'a> { } let mut buf = Vec::new(); std::mem::swap(&mut buf, &mut self.side_data); - return Ok(NAPacket::new(str, ts, self.vpts == 1, buf)); + return Ok(NAPacket::new(stream, ts, self.vpts == 1, buf)); }, 5 => { validate!(size <= 256);