projects
/
nihav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e14efb
)
give 'str' variables more appropriate names
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 4 Nov 2022 17:44:01 +0000
(18:44 +0100)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 4 Nov 2022 17:44:01 +0000
(18:44 +0100)
18 files changed:
nihav-codec-support/src/codecs/h263/code.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/demuxers/avi.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/demuxers/mov.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/demuxers/wav.rs
patch
|
blob
|
blame
|
history
nihav-commonfmt/src/muxers/avi.rs
patch
|
blob
|
blame
|
history
nihav-core/src/demuxers/mod.rs
patch
|
blob
|
blame
|
history
nihav-core/src/formats.rs
patch
|
blob
|
blame
|
history
nihav-core/src/options.rs
patch
|
blob
|
blame
|
history
nihav-duck/src/codecs/truemotion2.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/bmv.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/fst.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/gdv.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/imax.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/q.rs
patch
|
blob
|
blame
|
history
nihav-game/src/demuxers/vmd.rs
patch
|
blob
|
blame
|
history
nihav-indeo/src/codecs/intel263.rs
patch
|
blob
|
blame
|
history
nihav-realmedia/src/codecs/rv40dsp.rs
patch
|
blob
|
blame
|
history
nihav-realmedia/src/demuxers/realmedia.rs
patch
|
blob
|
blame
|
history
diff --git
a/nihav-codec-support/src/codecs/h263/code.rs
b/nihav-codec-support/src/codecs/h263/code.rs
index cbeb12042fad4946a79d04ce14f238ec6da0de1c..6ff42475d962944576184593ecefaa4254470d88 100644
(file)
--- a/
nihav-codec-support/src/codecs/h263/code.rs
+++ b/
nihav-codec-support/src/codecs/h263/code.rs
@@
-523,10
+523,10
@@
pub fn h263_filter_row(buf: &mut NAVideoBuffer<u8>, mb_y: usize, mb_w: usize, cb
let coded0 = cbpi.is_coded(mb_x, 0);
let coded1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
let coded0 = cbpi.is_coded(mb_x, 0);
let coded1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
if mb_y != 0 {
if mb_y != 0 {
- if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, str, coff); }
- if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, str, coff + 8); }
+ if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, str
ength
, coff); }
+ if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, str
ength
, coff + 8); }
}
let coff = off + 8 * stride;
if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); }
}
let coff = off + 8 * stride;
if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); }
@@
-542,7
+542,7
@@
pub fn h263_filter_row(buf: &mut NAVideoBuffer<u8>, mb_y: usize, mb_w: usize, cb
let ccur0 = cbpi.is_coded(mb_x, 0);
let ccur1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
let ccur0 = cbpi.is_coded(mb_x, 0);
let ccur1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
if mb_y != 0 {
let coff = off - 8 * stride;
let qtop = cbpi.get_q(mb_x);
if mb_y != 0 {
let coff = off - 8 * stride;
let qtop = cbpi.get_q(mb_x);
@@
-550,8
+550,8
@@
pub fn h263_filter_row(buf: &mut NAVideoBuffer<u8>, mb_y: usize, mb_w: usize, cb
if leftt && ctop0 { deblock_ver(buf, 0, strtop, coff); }
if ctop0 && ctop1 { deblock_ver(buf, 0, strtop, coff + 8); }
}
if leftt && ctop0 { deblock_ver(buf, 0, strtop, coff); }
if ctop0 && ctop1 { deblock_ver(buf, 0, strtop, coff + 8); }
}
- if leftc && ccur0 { deblock_ver(buf, 0, str, off); }
- if ccur0 && ccur1 { deblock_ver(buf, 0, str, off + 8); }
+ if leftc && ccur0 { deblock_ver(buf, 0, str
ength
, off); }
+ if ccur0 && ccur1 { deblock_ver(buf, 0, str
ength
, off + 8); }
leftt = ctop1;
leftc = ccur1;
off += 16;
leftt = ctop1;
leftc = ccur1;
off += 16;
@@
-567,9
+567,9
@@
pub fn h263_filter_row(buf: &mut NAVideoBuffer<u8>, mb_y: usize, mb_w: usize, cb
let ctv = cbpi.is_coded_top(mb_x, 5);
let ccv = cbpi.is_coded(mb_x, 5);
let q = cbpi.get_q(mb_w + mb_x);
let ctv = cbpi.is_coded_top(mb_x, 5);
let ccv = cbpi.is_coded(mb_x, 5);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
- if ctu && ccu { deblock_hor(buf, 1, str, offu + mb_x * 8); }
- if ctv && ccv { deblock_hor(buf, 2, str, offv + mb_x * 8); }
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ if ctu && ccu { deblock_hor(buf, 1, str
ength
, offu + mb_x * 8); }
+ if ctv && ccv { deblock_hor(buf, 2, str
ength
, offv + mb_x * 8); }
}
let mut leftu = false;
let mut leftv = false;
}
let mut leftu = false;
let mut leftv = false;
diff --git
a/nihav-commonfmt/src/demuxers/avi.rs
b/nihav-commonfmt/src/demuxers/avi.rs
index cd33c51ca150e210670834e3bfa4cee29bed411e..1e7a10fe57f495a314efe107b3f7e74a9da64ae8 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/avi.rs
+++ b/
nihav-commonfmt/src/demuxers/avi.rs
@@
-167,13
+167,13
@@
impl<'a> DemuxCore<'a> for AVIDemuxer<'a> {
}
continue;
}
}
continue;
}
- let str = strmgr.get_stream(stream_no as usize);
- if str.is_none() {
+ let str
eam
= strmgr.get_stream(stream_no as usize);
+ if str
eam
.is_none() {
self.src.read_skip(size)?;
self.movi_size -= size + 8;
continue;
}
self.src.read_skip(size)?;
self.movi_size -= size + 8;
continue;
}
- let stream = str.unwrap();
+ let stream = str
eam
.unwrap();
if size == 0 {
self.movi_size -= 8;
if self.movi_size == 0 {
if size == 0 {
self.movi_size -= 8;
if self.movi_size == 0 {
diff --git
a/nihav-commonfmt/src/demuxers/mov.rs
b/nihav-commonfmt/src/demuxers/mov.rs
index ce2b0bfc665509402f9db5629d03d2ccd0e8597c..59b4cdd0939fd434daab139d626cfd73b611c52b 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/mov.rs
+++ b/
nihav-commonfmt/src/demuxers/mov.rs
@@
-1550,9
+1550,9
@@
fn process_packet(src: &mut ByteReader, strmgr: &StreamManager, track: &mut Trac
} else {
track.cur_ts = None;
}
} else {
track.cur_ts = None;
}
- let str = strmgr.get_stream(track.track_str_id);
- if str.is_none() { return Err(DemuxerError::InvalidData); }
- let stream = str.unwrap();
+ let str
eam
= strmgr.get_stream(track.track_str_id);
+ if str
eam
.is_none() { return Err(DemuxerError::InvalidData); }
+ let stream = str
eam
.unwrap();
src.seek(SeekFrom::Start(offset))?;
let mut pkt = src.read_packet(stream, pts, false, size)?;
if let Some(ref pal) = track.pal {
src.seek(SeekFrom::Start(offset))?;
let mut pkt = src.read_packet(stream, pts, false, size)?;
if let Some(ref pal) = track.pal {
@@
-1568,9
+1568,9
@@
impl<'a> DemuxCore<'a> for MOVDemuxer<'a> {
validate!(self.mdat_pos > 0);
validate!(!self.tracks.is_empty());
for track in self.tracks.iter_mut() {
validate!(self.mdat_pos > 0);
validate!(!self.tracks.is_empty());
for track in self.tracks.iter_mut() {
- let mut str = None;
- std::mem::swap(&mut track.stream, &mut str);
- if let Some(stream) = str {
+ let mut str
m
= None;
+ std::mem::swap(&mut track.stream, &mut str
m
);
+ if let Some(stream) = str
m
{
let str_id = strmgr.add_stream(stream).unwrap();
track.track_str_id = str_id;
}
let str_id = strmgr.add_stream(stream).unwrap();
track.track_str_id = str_id;
}
diff --git
a/nihav-commonfmt/src/demuxers/wav.rs
b/nihav-commonfmt/src/demuxers/wav.rs
index 1e685de8705bd23d49d526e4e78793a1ec142c6a..1a2ead772e6ab85235d2f95b4f9f2f8543b30c85 100644
(file)
--- a/
nihav-commonfmt/src/demuxers/wav.rs
+++ b/
nihav-commonfmt/src/demuxers/wav.rs
@@
-75,9
+75,9
@@
impl<'a> DemuxCore<'a> for WAVDemuxer<'a> {
if self.src.tell() >= self.data_end {
return Err(DemuxerError::EOF);
}
if self.src.tell() >= self.data_end {
return Err(DemuxerError::EOF);
}
- let str = strmgr.get_stream(0);
- if str.is_none() { return Err(InvalidData); }
- let stream = str.unwrap();
+ let str
m
= strmgr.get_stream(0);
+ if str
m
.is_none() { return Err(InvalidData); }
+ let stream = str
m
.unwrap();
let pts = if self.avg_bytes != 0 {
let pos = self.src.tell() - self.data_pos;
Some(pos * u64::from(self.srate) / u64::from(self.avg_bytes))
let pts = if self.avg_bytes != 0 {
let pos = self.src.tell() - self.data_pos;
Some(pos * u64::from(self.srate) / u64::from(self.avg_bytes))
diff --git
a/nihav-commonfmt/src/muxers/avi.rs
b/nihav-commonfmt/src/muxers/avi.rs
index ac09974d7eef7a02de10533cac2e39a2dad9bdbf..5e98ed998e3673e109e2aabd97199083fabaf7c7 100644
(file)
--- a/
nihav-commonfmt/src/muxers/avi.rs
+++ b/
nihav-commonfmt/src/muxers/avi.rs
@@
-238,8
+238,8
@@
impl<'a> MuxCore<'a> for AVIMuxer<'a> {
if self.data_pos == 0 {
return Err(MuxerError::NotCreated);
}
if self.data_pos == 0 {
return Err(MuxerError::NotCreated);
}
- let str = pkt.get_stream();
- let str_num = str.get_num();
+ let str
eam
= pkt.get_stream();
+ let str_num = str
eam
.get_num();
if str_num > 99 || str_num >= self.stream_info.len() {
return Err(MuxerError::UnsupportedFormat);
}
if str_num > 99 || str_num >= self.stream_info.len() {
return Err(MuxerError::UnsupportedFormat);
}
@@
-282,11
+282,11
@@
impl<'a> MuxCore<'a> for AVIMuxer<'a> {
self.stream_info[str_num].max_size = self.stream_info[str_num].max_size.max(chunk_len);
self.index.push(IdxEntry {
stream: str_num as u32,
self.stream_info[str_num].max_size = self.stream_info[str_num].max_size.max(chunk_len);
self.index.push(IdxEntry {
stream: str_num as u32,
- stype: str.get_media_type(),
+ stype: str
eam
.get_media_type(),
key: pkt.keyframe,
pos: self.bw.tell() as u32,
len: chunk_len });
key: pkt.keyframe,
pos: self.bw.tell() as u32,
len: chunk_len });
- write_chunk_hdr(self.bw, str.get_media_type(), str_num as u32)?;
+ write_chunk_hdr(self.bw, str
eam
.get_media_type(), str_num as u32)?;
self.bw.write_u32le(chunk_len)?;
self.bw.write_buf(pkt.get_buffer().as_slice())?;
if (self.bw.tell() & 1) != 0 {
self.bw.write_u32le(chunk_len)?;
self.bw.write_buf(pkt.get_buffer().as_slice())?;
if (self.bw.tell() & 1) != 0 {
diff --git
a/nihav-core/src/demuxers/mod.rs
b/nihav-core/src/demuxers/mod.rs
index 46e06175e10924698da87cc5ac28f3b2cff321d4..23f27fbfa8d6c47eea22b546effba452a42a7ca5 100644
(file)
--- a/
nihav-core/src/demuxers/mod.rs
+++ b/
nihav-core/src/demuxers/mod.rs
@@
-90,9
+90,9
@@
impl StreamManager {
/// Adds a new stream.
pub fn add_stream(&mut self, stream: NAStream) -> Option<usize> {
let stream_num = self.streams.len();
/// Adds a new stream.
pub fn add_stream(&mut self, stream: NAStream) -> Option<usize> {
let stream_num = self.streams.len();
- let mut str = stream;
- str.set_num(stream_num);
- self.streams.push(str.into_ref());
+ let mut str
eam
= stream;
+ str
eam
.set_num(stream_num);
+ self.streams.push(str
eam
.into_ref());
self.ignored.push(false);
Some(stream_num)
}
self.ignored.push(false);
Some(stream_num)
}
@@
-309,9
+309,9
@@
impl SeekIndex {
}
/// Returns stream reference for provided stream ID.
pub fn get_stream_index(&mut self, id: u32) -> Option<&mut StreamSeekInfo> {
}
/// Returns stream reference for provided stream ID.
pub fn get_stream_index(&mut self, id: u32) -> Option<&mut StreamSeekInfo> {
- for str in self.seek_info.iter_mut() {
- if str.id == id {
- return Some(str);
+ for str
eam
in self.seek_info.iter_mut() {
+ if str
eam
.id == id {
+ return Some(str
eam
);
}
}
None
}
}
None
@@
-328,16
+328,16
@@
impl SeekIndex {
/// Searches for a seek position before requested time.
pub fn find_pos(&self, time: NATimePoint) -> Option<SeekIndexResult> {
let mut cand = None;
/// Searches for a seek position before requested time.
pub fn find_pos(&self, time: NATimePoint) -> Option<SeekIndexResult> {
let mut cand = None;
- for str in self.seek_info.iter() {
- if !str.filled { continue; }
- let res = str.find_pos(time);
+ for str
eam
in self.seek_info.iter() {
+ if !str
eam
.filled { continue; }
+ let res = str
eam
.find_pos(time);
if res.is_none() { continue; }
let res = res.unwrap();
if cand.is_none() {
if res.is_none() { continue; }
let res = res.unwrap();
if cand.is_none() {
- cand = Some(SeekIndexResult { pts: res.pts, pos: res.pos, str_id: str.id });
+ cand = Some(SeekIndexResult { pts: res.pts, pos: res.pos, str_id: str
eam
.id });
} else if let Some(entry) = cand {
if res.pos < entry.pos {
} else if let Some(entry) = cand {
if res.pos < entry.pos {
- cand = Some(SeekIndexResult { pts: res.pts, pos: res.pos, str_id: str.id });
+ cand = Some(SeekIndexResult { pts: res.pts, pos: res.pos, str_id: str
eam
.id });
}
}
}
}
}
}
@@
-465,10
+465,10
@@
pub trait DemuxerCreator {
/// Creates demuxer for a provided bytestream.
pub fn create_demuxer<'a>(dmxcr: &dyn DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
/// Creates demuxer for a provided bytestream.
pub fn create_demuxer<'a>(dmxcr: &dyn DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
- let mut str = StreamManager::new();
+ let mut str
mgr
= StreamManager::new();
let mut seek_idx = SeekIndex::new();
let mut seek_idx = SeekIndex::new();
- dmx.open(&mut str, &mut seek_idx)?;
- Ok(Demuxer::new(dmx, str, seek_idx))
+ dmx.open(&mut str
mgr
, &mut seek_idx)?;
+ Ok(Demuxer::new(dmx, str
mgr
, seek_idx))
}
/// List of registered demuxers.
}
/// List of registered demuxers.
@@
-631,10
+631,10
@@
pub trait RawDemuxerCreator {
/// Creates raw data demuxer for a provided bytestream.
pub fn create_raw_demuxer<'a>(dmxcr: &dyn RawDemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<RawDemuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
/// Creates raw data demuxer for a provided bytestream.
pub fn create_raw_demuxer<'a>(dmxcr: &dyn RawDemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<RawDemuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
- let mut str = StreamManager::new();
+ let mut str
mgr
= StreamManager::new();
let mut seek_idx = SeekIndex::new();
let mut seek_idx = SeekIndex::new();
- dmx.open(&mut str, &mut seek_idx)?;
- Ok(RawDemuxer::new(dmx, str, seek_idx))
+ dmx.open(&mut str
mgr
, &mut seek_idx)?;
+ Ok(RawDemuxer::new(dmx, str
mgr
, seek_idx))
}
/// List of registered demuxers.
}
/// List of registered demuxers.
diff --git
a/nihav-core/src/formats.rs
b/nihav-core/src/formats.rs
index c0027ece05379a24a3c1e19deae0daf59277006e..810fff25ddc1a0de03896ac659df1fbf6737e6a9 100644
(file)
--- a/
nihav-core/src/formats.rs
+++ b/
nihav-core/src/formats.rs
@@
-820,13
+820,13
@@
impl fmt::Display for NAPixelFormaton {
let end = if self.be { "BE" } else { "LE" };
let palstr = if self.palette { "palette " } else { "" };
let astr = if self.alpha { "alpha " } else { "" };
let end = if self.be { "BE" } else { "LE" };
let palstr = if self.palette { "palette " } else { "" };
let astr = if self.alpha { "alpha " } else { "" };
- let mut str = format!("Formaton for {} ({}{}elem {} size {}): ", self.model, palstr, astr,end, self.elem_size);
+ let mut str
ing
= format!("Formaton for {} ({}{}elem {} size {}): ", self.model, palstr, astr,end, self.elem_size);
for i in 0..self.comp_info.len() {
if let Some(chr) = self.comp_info[i] {
for i in 0..self.comp_info.len() {
if let Some(chr) = self.comp_info[i] {
- str
= format!("{} {}", str
, chr);
+ str
ing = format!("{} {}", string
, chr);
}
}
}
}
- write!(f, "[{}]", str)
+ write!(f, "[{}]", str
ing
)
}
}
}
}
diff --git
a/nihav-core/src/options.rs
b/nihav-core/src/options.rs
index 4e4c7aa7753759c9a8b087d752f031c7b4edc805..b09bf0584db175a81a5dd2a9dc9fed2282bfdfae 100644
(file)
--- a/
nihav-core/src/options.rs
+++ b/
nihav-core/src/options.rs
@@
-184,8
+184,8
@@
impl NAOptionDefinition {
},
NAValue::String(ref cur_str) => {
if let NAOptionDefinitionType::String(Some(strings)) = self.opt_type {
},
NAValue::String(ref cur_str) => {
if let NAOptionDefinitionType::String(Some(strings)) = self.opt_type {
- for str in strings.iter() {
- if cur_str == str {
+ for str
ing
in strings.iter() {
+ if cur_str == str
ing
{
return Ok(());
}
}
return Ok(());
}
}
diff --git
a/nihav-duck/src/codecs/truemotion2.rs
b/nihav-duck/src/codecs/truemotion2.rs
index dfbbf9b120fdd9dd9476db56bceee0864a79619d..4020e732810833f9744103bd388dfb9e73d5ef87 100644
(file)
--- a/
nihav-duck/src/codecs/truemotion2.rs
+++ b/
nihav-duck/src/codecs/truemotion2.rs
@@
-561,8
+561,8
@@
impl NADecoder for TM2Decoder {
let magic = br.read_u32be()?;
validate!(magic == 0x100 || magic == 0x101);
br.read_skip(36)?;
let magic = br.read_u32be()?;
validate!(magic == 0x100 || magic == 0x101);
br.read_skip(36)?;
- for str in self.streams.iter_mut() {
- str.read_header(&src, &mut br)?;
+ for str
eam
in self.streams.iter_mut() {
+ str
eam
.read_header(&src, &mut br)?;
}
let myinfo = NAVideoInfo::new(self.width, self.height, false, RGB24_FORMAT);
}
let myinfo = NAVideoInfo::new(self.width, self.height, false, RGB24_FORMAT);
diff --git
a/nihav-game/src/demuxers/bmv.rs
b/nihav-game/src/demuxers/bmv.rs
index 700c8d07f2fd0620b03887b45fa8b33ec976d897..66f1df91e53356059e185a9414d7c012e7a857a1 100644
(file)
--- 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 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 str
eam
= strmgr.get_stream(self.aud_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.apos), None, None);
+ let apkt = self.src.read_packet(str
eam
, ts, false, asize)?;
self.apos += u64::from(nblocks) * 32;
self.pkt_buf.push(apkt);
} else {
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..])?;
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 str
eam
= strmgr.get_stream(self.vid_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.vpos), None, None);
+ let pkt = NAPacket::new(str
eam
, ts, (ctype & 3) == 3, buf);
self.vpos += 1;
return Ok(pkt);
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..])?;
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 str
eam
= strmgr.get_stream(self.aud_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.apos), None, None);
+ let apkt = NAPacket::new(str
eam
, ts, false, buf);
self.apos += (asize as u64) / 41 * 32;
self.pkt_buf.push(apkt);
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..])?;
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 str
eam
= strmgr.get_stream(self.vid_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.vpos), None, None);
+ let pkt = NAPacket::new(str
eam
, ts, (ctype & 3) == 3, buf);
self.vpos += 1;
return Ok(pkt);
self.vpos += 1;
return Ok(pkt);
diff --git
a/nihav-game/src/demuxers/fst.rs
b/nihav-game/src/demuxers/fst.rs
index 68f953747cda09d7eb2aa6537fedf9712ae75874..f71601e95cd5a39795945455dff7a24656dc94b9 100644
(file)
--- a/
nihav-game/src/demuxers/fst.rs
+++ b/
nihav-game/src/demuxers/fst.rs
@@
-72,9
+72,9
@@
impl<'a> DemuxCore<'a> for FutureVisionVideoDemuxer<'a> {
self.cur_frame += 1;
}
self.cur_frame += 1;
}
- let str = strmgr.get_stream(id).unwrap();
- let ts = str.make_ts(Some(pts), None, None);
- self.src.read_packet(str, ts, true, size)
+ let str
eam
= strmgr.get_stream(id).unwrap();
+ let ts = str
eam
.make_ts(Some(pts), None, None);
+ self.src.read_packet(str
eam
, ts, true, size)
}
fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
}
fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
@@
-146,9
+146,9
@@
impl<'a> DemuxCore<'a> for FutureVisionAudioDemuxer<'a> {
let size = (self.end - self.src.tell()).min(0x2000) as usize;
let pts = (self.src.tell() - 14) * 2;
let size = (self.end - self.src.tell()).min(0x2000) as usize;
let pts = (self.src.tell() - 14) * 2;
- let str = strmgr.get_stream(self.a_id).unwrap();
- let ts = str.make_ts(Some(pts), None, None);
- self.src.read_packet(str, ts, true, size)
+ let str
eam
= strmgr.get_stream(self.a_id).unwrap();
+ let ts = str
eam
.make_ts(Some(pts), None, None);
+ self.src.read_packet(str
eam
, ts, true, size)
}
fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
}
fn seek(&mut self, _time: NATimePoint, _seek_index: &SeekIndex) -> DemuxerResult<()> {
diff --git
a/nihav-game/src/demuxers/gdv.rs
b/nihav-game/src/demuxers/gdv.rs
index 876f3c16cb21dedaf468b1f7c4b1766ab7cf4040..8ae27c61b95376be112010c2262d1638cb41a9c5 100644
(file)
--- 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<NAPacket> {
self.state = GDVState::AudioRead;
fn read_achunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
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 str
eam
= strmgr.get_stream(self.a_id.unwrap()).unwrap();
+ let ts = str
eam
.make_ts(Some(u64::from(self.cur_frame)), None, None);
+ self.src.read_packet(str
eam
, ts, true, self.asize)
}
fn read_vchunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
}
fn read_vchunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
- let str = strmgr.get_stream(self.v_id.unwrap()).unwrap();
+ let str
eam
= 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); }
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 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 = str
eam
.make_ts(Some(u64::from(self.cur_frame - 1)), None, None);
+ src.read_packet(str
eam
, ts, (flags & 64) != 0, size)
}
}
}
}
diff --git
a/nihav-game/src/demuxers/imax.rs
b/nihav-game/src/demuxers/imax.rs
index 2cd9f70c3807a7975890aff93de03e17c27cd2cc..999ea1ae9d49292c7385775ce0a3d5793b97c9e7 100644
(file)
--- a/
nihav-game/src/demuxers/imax.rs
+++ b/
nihav-game/src/demuxers/imax.rs
@@
-48,10
+48,10
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
match ftype {
0xAA97 => {
match ftype {
0xAA97 => {
- let str = strmgr.get_stream(self.v_id).unwrap();
- let ts = str.make_ts(Some(self.cur_frame), None, None);
+ let str
eam
= strmgr.get_stream(self.v_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.cur_frame), None, None);
self.cur_frame += 1;
self.cur_frame += 1;
- let mut pkt = self.src.read_packet(str, ts, true, fsize)?;
+ let mut pkt = self.src.read_packet(str
eam
, ts, true, fsize)?;
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
self.pal_change = false;
return Ok(pkt);
pkt.add_side_data(NASideData::Palette(self.pal_change, self.pal.clone()));
self.pal_change = false;
return Ok(pkt);
@@
-71,10
+71,10
@@
impl<'a> DemuxCore<'a> for IMAXDemuxer<'a> {
self.pal_change = true;
},
0xAA99 => {
self.pal_change = true;
},
0xAA99 => {
- let str = strmgr.get_stream(self.a_id).unwrap();
- let ts = str.make_ts(Some(self.apos), None, None);
+ let str
eam
= strmgr.get_stream(self.a_id).unwrap();
+ let ts = str
eam
.make_ts(Some(self.apos), None, None);
self.apos += fsize as u64;
self.apos += fsize as u64;
- return self.src.read_packet(str, ts, true, fsize);
+ return self.src.read_packet(str
eam
, ts, true, fsize);
},
0xAAFF => return Err(DemuxerError::EOF),
_ => return Err(DemuxerError::InvalidData),
},
0xAAFF => return Err(DemuxerError::EOF),
_ => return Err(DemuxerError::InvalidData),
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);
diff --git
a/nihav-game/src/demuxers/vmd.rs
b/nihav-game/src/demuxers/vmd.rs
index c1ef0bef0fa15361b7b19e33048e6f23725c255d..3341fd1de50a7076500ec6b25801f26c9e0c4e05 100644
(file)
--- a/
nihav-game/src/demuxers/vmd.rs
+++ b/
nihav-game/src/demuxers/vmd.rs
@@
-172,9
+172,9
@@
impl<'a> DemuxCore<'a> for VMDDemuxer<'a> {
self.fno += 1;
let str_id = if is_video { self.vid_id } else { self.aud_id };
self.fno += 1;
let str_id = if is_video { self.vid_id } else { self.aud_id };
- let str = strmgr.get_stream(str_id).unwrap();
- let ts = str.make_ts(Some(u64::from(cur_frame.ts)), None, None);
- let pkt = NAPacket::new(str, ts, false, buf);
+ let str
eam
= strmgr.get_stream(str_id).unwrap();
+ let ts = str
eam
.make_ts(Some(u64::from(cur_frame.ts)), None, None);
+ let pkt = NAPacket::new(str
eam
, ts, false, buf);
Ok(pkt)
}
Ok(pkt)
}
diff --git
a/nihav-indeo/src/codecs/intel263.rs
b/nihav-indeo/src/codecs/intel263.rs
index da1c10b130d6a1e04245063f76936c823067fdb5..62762bca63397784e42f17fcb84a2cef0b6ced64 100644
(file)
--- a/
nihav-indeo/src/codecs/intel263.rs
+++ b/
nihav-indeo/src/codecs/intel263.rs
@@
-263,10
+263,10
@@
impl BlockDSP for I263BlockDSP {
let coded0 = cbpi.is_coded(mb_x, 0);
let coded1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
let coded0 = cbpi.is_coded(mb_x, 0);
let coded1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
if mb_y != 0 {
if mb_y != 0 {
- if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, str, coff); }
- if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, str, coff + 8); }
+ if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, str
ength
, coff); }
+ if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, str
ength
, coff + 8); }
}
let coff = off + 8 * stride;
if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); }
}
let coff = off + 8 * stride;
if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); }
@@
-282,7
+282,7
@@
impl BlockDSP for I263BlockDSP {
let ccur0 = cbpi.is_coded(mb_x, 0);
let ccur1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
let ccur0 = cbpi.is_coded(mb_x, 0);
let ccur1 = cbpi.is_coded(mb_x, 1);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
if mb_y != 0 {
let coff = off - 8 * stride;
let qtop = cbpi.get_q(mb_x);
if mb_y != 0 {
let coff = off - 8 * stride;
let qtop = cbpi.get_q(mb_x);
@@
-290,8
+290,8
@@
impl BlockDSP for I263BlockDSP {
if leftt && ctop0 { deblock_ver(buf, 0, strtop, coff); }
if ctop0 && ctop1 { deblock_ver(buf, 0, strtop, coff + 8); }
}
if leftt && ctop0 { deblock_ver(buf, 0, strtop, coff); }
if ctop0 && ctop1 { deblock_ver(buf, 0, strtop, coff + 8); }
}
- if leftc && ccur0 { deblock_ver(buf, 0, str, off); }
- if ccur0 && ccur1 { deblock_ver(buf, 0, str, off + 8); }
+ if leftc && ccur0 { deblock_ver(buf, 0, str
ength
, off); }
+ if ccur0 && ccur1 { deblock_ver(buf, 0, str
ength
, off + 8); }
leftt = ctop1;
leftc = ccur1;
off += 16;
leftt = ctop1;
leftc = ccur1;
off += 16;
@@
-307,9
+307,9
@@
impl BlockDSP for I263BlockDSP {
let ctv = cbpi.is_coded_top(mb_x, 5);
let ccv = cbpi.is_coded(mb_x, 5);
let q = cbpi.get_q(mb_w + mb_x);
let ctv = cbpi.is_coded_top(mb_x, 5);
let ccv = cbpi.is_coded(mb_x, 5);
let q = cbpi.get_q(mb_w + mb_x);
- let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
- if ctu && ccu { deblock_hor(buf, 1, str, offu + mb_x * 8); }
- if ctv && ccv { deblock_hor(buf, 2, str, offv + mb_x * 8); }
+ let str
ength
= if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+ if ctu && ccu { deblock_hor(buf, 1, str
ength
, offu + mb_x * 8); }
+ if ctv && ccv { deblock_hor(buf, 2, str
ength
, offv + mb_x * 8); }
}
let mut leftu = false;
let mut leftv = false;
}
let mut leftu = false;
let mut leftv = false;
diff --git
a/nihav-realmedia/src/codecs/rv40dsp.rs
b/nihav-realmedia/src/codecs/rv40dsp.rs
index a883b0b9e0e84e7943302e6fbf89341baaf9b2da..2300941c8317b7a9645c377c6d70aa6c3d87fb8a 100644
(file)
--- a/
nihav-realmedia/src/codecs/rv40dsp.rs
+++ b/
nihav-realmedia/src/codecs/rv40dsp.rs
@@
-285,14
+285,14
@@
fn rv40_weak_loop_filter4(pix: &mut [u8], mut off: usize, step: usize, stride: u
let q1 = el!(pix, off + step);
let q2 = el!(pix, off + 2*step);
let q1 = el!(pix, off + step);
let q2 = el!(pix, off + 2*step);
- let str;
+ let str
ength
;
if filter_p1 && filter_q1 {
if filter_p1 && filter_q1 {
- str = (t << 2) + (p1 - q1);
+ str
ength
= (t << 2) + (p1 - q1);
} else {
} else {
- str = t << 2;
+ str
ength
= t << 2;
}
}
- let diff = clip_symm((str + 4) >> 3, lim_p0q0);
+ let diff = clip_symm((str
ength
+ 4) >> 3, lim_p0q0);
pix[off - step] = clip8(p0 + diff);
pix[off ] = clip8(q0 - diff);
pix[off - step] = clip8(p0 + diff);
pix[off ] = clip8(q0 - diff);
@@
-340,14
+340,14
@@
fn rv40_weak_loop_filter4_v(pix: &mut [u8], off: usize, stride: usize,
let q1 = el!(ch, 3 + 1);
let q2 = el!(ch, 3 + 2);
let q1 = el!(ch, 3 + 1);
let q2 = el!(ch, 3 + 2);
- let str;
+ let str
ength
;
if filter_p1 && filter_q1 {
if filter_p1 && filter_q1 {
- str = (t << 2) + (p1 - q1);
+ str
ength
= (t << 2) + (p1 - q1);
} else {
} else {
- str = t << 2;
+ str
ength
= t << 2;
}
}
- let diff = clip_symm((str + 4) >> 3, lim_p0q0);
+ let diff = clip_symm((str
ength
+ 4) >> 3, lim_p0q0);
ch[3 - 1] = clip8(p0 + diff);
ch[3 ] = clip8(q0 - diff);
ch[3 - 1] = clip8(p0 + diff);
ch[3 ] = clip8(q0 - diff);
diff --git
a/nihav-realmedia/src/demuxers/realmedia.rs
b/nihav-realmedia/src/demuxers/realmedia.rs
index cfcccb84a0de0206bccdb29937bc8cbcf8e4f26c..322fdc00d63836ff43dd0f98788522655ac772ac 100644
(file)
--- a/
nihav-realmedia/src/demuxers/realmedia.rs
+++ b/
nihav-realmedia/src/demuxers/realmedia.rs
@@
-1186,8
+1186,7
@@
fn read_string_size(src: &mut ByteReader, size: usize) -> DemuxerResult<String>
let c = src.read_byte()?;
vec.push(c);
}
let c = src.read_byte()?;
vec.push(c);
}
- let str = String::from_utf8(vec);
- if let Ok(res) = str {
+ if let Ok(res) = String::from_utf8(vec) {
Ok(res)
} else {
Ok(String::new())
Ok(res)
} else {
Ok(String::new())
@@
-1307,7
+1306,7
@@
impl<'a> RealAudioDemuxer<'a> {
enum IVRRecord {
Invalid(u8),
StreamProperties(usize),
enum IVRRecord {
Invalid(u8),
StreamProperties(usize),
- Packet { ts: u32, str: u32, flags: u32, len: usize, checksum: u32 },
+ Packet { ts: u32, str
m
: u32, flags: u32, len: usize, checksum: u32 },
IntValue(Vec<u8>, u32),
BinaryData(Vec<u8>, Vec<u8>),
StringData(Vec<u8>, Vec<u8>),
IntValue(Vec<u8>, u32),
BinaryData(Vec<u8>, Vec<u8>),
StringData(Vec<u8>, Vec<u8>),
@@
-1333,12
+1332,12
@@
impl IVRRecord {
},
2 => {
let ts = src.read_u32be()?;
},
2 => {
let ts = src.read_u32be()?;
- let str
= src.read_u16be()? as u32;
+ let str
m
= src.read_u16be()? as u32;
let flags = src.read_u32be()?;
let len = src.read_u32be()? as usize;
let chk = src.read_u32be()?;
validate!((len > 0) && (len < (1 << 24)));
let flags = src.read_u32be()?;
let len = src.read_u32be()? as usize;
let chk = src.read_u32be()?;
validate!((len > 0) && (len < (1 << 24)));
- Ok(IVRRecord::Packet { ts, str, flags, len, checksum: chk })
+ Ok(IVRRecord::Packet { ts, str
m
, flags, len, checksum: chk })
},
3 => {
let name = Self::read_string(src)?;
},
3 => {
let name = Self::read_string(src)?;
@@
-1382,8
+1381,8
@@
impl fmt::Display for IVRRecord {
IVRRecord::Invalid(typ) => write!(f, "Invalid({:02X})", typ),
IVRRecord::StreamProperties(num) =>
write!(f, "({} stream properties)", num),
IVRRecord::Invalid(typ) => write!(f, "Invalid({:02X})", typ),
IVRRecord::StreamProperties(num) =>
write!(f, "({} stream properties)", num),
- IVRRecord::Packet { ts, str, flags, len, checksum } =>
- write!(f, "paket({}, {}, {:X}, {}, {})", ts, str, flags, len, checksum),
+ IVRRecord::Packet { ts, str
m
, flags, len, checksum } =>
+ write!(f, "paket({}, {}, {:X}, {}, {})", ts, str
m
, flags, len, checksum),
IVRRecord::IntValue(ref name, val) =>
write!(f, "({} = {})", String::from_utf8_lossy(name), val),
IVRRecord::BinaryData(ref name, ref val) =>
IVRRecord::IntValue(ref name, val) =>
write!(f, "({} = {})", String::from_utf8_lossy(name), val),
IVRRecord::BinaryData(ref name, ref val) =>
@@
-1503,9
+1502,9
@@
impl RecordDemuxer {
loop {
let rec = IVRRecord::read(src)?;
match rec {
loop {
let rec = IVRRecord::read(src)?;
match rec {
- IVRRecord::Packet { ts, str, flags, len, .. } => {
+ IVRRecord::Packet { ts, str
m
, flags, len, .. } => {
let payload_size = len;
let payload_size = len;
- let sr = self.remap_ids.iter().position(|x| *x == str);
+ let sr = self.remap_ids.iter().position(|x| *x == str
m
);
validate!(sr.is_some());
let str_no = self.start_str + (sr.unwrap() as u32);
let pkt_grp = ((flags >> 8) & 0xFF) as u16;
validate!(sr.is_some());
let str_no = self.start_str + (sr.unwrap() as u32);
let pkt_grp = ((flags >> 8) & 0xFF) as u16;