X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fbmv.rs;fp=nihav-game%2Fsrc%2Fdemuxers%2Fbmv.rs;h=66f1df91e53356059e185a9414d7c012e7a857a1;hp=700c8d07f2fd0620b03887b45fa8b33ec976d897;hb=817e487223b28379176a533f09485c27a68443f8;hpb=8e14efb001fac3fecb0cb56df8705d23fa2231a8

diff --git a/nihav-game/src/demuxers/bmv.rs b/nihav-game/src/demuxers/bmv.rs
index 700c8d0..66f1df9 100644
--- a/nihav-game/src/demuxers/bmv.rs
+++ b/nihav-game/src/demuxers/bmv.rs
@@ -47,9 +47,9 @@ impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
                 let nblocks             = self.src.peek_byte()?;
                 asize = (nblocks as usize) * 65 + 1;
                 validate!(asize < size);
-                let str = strmgr.get_stream(self.aud_id).unwrap();
-                let ts = str.make_ts(Some(self.apos), None, None);
-                let apkt = self.src.read_packet(str, ts, false, asize)?;
+                let stream = strmgr.get_stream(self.aud_id).unwrap();
+                let ts = stream.make_ts(Some(self.apos), None, None);
+                let apkt = self.src.read_packet(stream, ts, false, asize)?;
                 self.apos += u64::from(nblocks) * 32;
                 self.pkt_buf.push(apkt);
             } else {
@@ -59,9 +59,9 @@ impl<'a> DemuxCore<'a> for BMVDemuxer<'a> {
             buf[0] = ctype;
             self.src.read_buf(&mut buf[1..])?;
 
-            let str = strmgr.get_stream(self.vid_id).unwrap();
-            let ts = str.make_ts(Some(self.vpos), None, None);
-            let pkt = NAPacket::new(str, ts, (ctype & 3) == 3, buf);
+            let stream = strmgr.get_stream(self.vid_id).unwrap();
+            let ts = stream.make_ts(Some(self.vpos), None, None);
+            let pkt = NAPacket::new(stream, ts, (ctype & 3) == 3, buf);
 
             self.vpos += 1;
             return Ok(pkt);
@@ -186,9 +186,9 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
                 buf[0] = (self.src.tell() & 1) as u8;
                 self.src.read_buf(&mut buf[1..])?;
 
-                let str = strmgr.get_stream(self.aud_id).unwrap();
-                let ts = str.make_ts(Some(self.apos), None, None);
-                let apkt = NAPacket::new(str, ts, false, buf);
+                let stream = strmgr.get_stream(self.aud_id).unwrap();
+                let ts = stream.make_ts(Some(self.apos), None, None);
+                let apkt = NAPacket::new(stream, ts, false, buf);
 
                 self.apos += (asize as u64) / 41 * 32;
                 self.pkt_buf.push(apkt);
@@ -206,9 +206,9 @@ impl<'a> DemuxCore<'a> for BMV3Demuxer<'a> {
             buf[0] = ctype;
             self.src.read_buf(&mut buf[1..])?;
 
-            let str = strmgr.get_stream(self.vid_id).unwrap();
-            let ts = str.make_ts(Some(self.vpos), None, None);
-            let pkt = NAPacket::new(str, ts, (ctype & 3) == 3, buf);
+            let stream = strmgr.get_stream(self.vid_id).unwrap();
+            let ts = stream.make_ts(Some(self.vpos), None, None);
+            let pkt = NAPacket::new(stream, ts, (ctype & 3) == 3, buf);
 
             self.vpos += 1;
             return Ok(pkt);