projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
give 'str' variables more appropriate names
[nihav.git]
/
nihav-game
/
src
/
demuxers
/
q.rs
diff --git
a/nihav-game/src/demuxers/q.rs
b/nihav-game/src/demuxers/q.rs
index 3735bfaf836f61f61e286c516b5f7b5883ce0c8b..071f00f17f288a054b9e654af75a74a8af7620e6 100644
(file)
--- 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 {
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 str
eam
= strmgr.get_stream(a_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.apts), None, None);
self.apts += (size / self.bps) as u64;
self.apts += (size / self.bps) as u64;
- return self.src.read_packet(str, ts, true, size);
+ return self.src.read_packet(str
eam
, ts, true, size);
} else {
self.src.read_skip(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());
},
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 str
eam
= strmgr.get_stream(self.v_id.unwrap_or(0)).unwrap();
+ let ts = str
eam
.make_ts(Some(self.vpts), None, None);
self.vpts += 1;
let cur_len = self.side_data.len();
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);
}
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(str
eam
, ts, self.vpts == 1, buf));
},
5 => {
validate!(size <= 256);
},
5 => {
validate!(size <= 256);