projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make BitReader rely on passed slice size without the additional arguments.
[nihav.git]
/
nihav-realmedia
/
src
/
codecs
/
rv10.rs
diff --git
a/nihav-realmedia/src/codecs/rv10.rs
b/nihav-realmedia/src/codecs/rv10.rs
index 2426cd8f2c0cc7a18f54be6223e18063e4fa409d..6a7325fc7f4f542a1a64a2306d816a47c0d53930 100644
(file)
--- a/
nihav-realmedia/src/codecs/rv10.rs
+++ b/
nihav-realmedia/src/codecs/rv10.rs
@@
-67,7
+67,7
@@
impl<'a> RealVideo10BR<'a> {
let mut slice_offs = Vec::with_capacity(nslices);
{
let offs = &src[1..][..nslices * 8];
let mut slice_offs = Vec::with_capacity(nslices);
{
let offs = &src[1..][..nslices * 8];
- let mut br = BitReader::new(offs,
offs.len(),
BitReaderMode::BE);
+ let mut br = BitReader::new(offs, BitReaderMode::BE);
for _ in 0..nslices {
br.skip(32).unwrap();
let off = br.read(32).unwrap();
for _ in 0..nslices {
br.skip(32).unwrap();
let off = br.read(32).unwrap();
@@
-76,7
+76,7
@@
impl<'a> RealVideo10BR<'a> {
}
let soff = nslices * 8 + 1;
RealVideo10BR {
}
let soff = nslices * 8 + 1;
RealVideo10BR {
- br: BitReader::new(&src[soff..],
src.len() - soff,
BitReaderMode::BE),
+ br: BitReader::new(&src[soff..], BitReaderMode::BE),
tables,
num_slices: nslices,
slice_no: 0,
tables,
num_slices: nslices,
slice_no: 0,
@@
-425,7
+425,7
@@
println!("ver {:06X} -> {}", ver, mic_ver);
self.mvmode = MVMode::UMV;
}
{
self.mvmode = MVMode::UMV;
}
{
-let mut br = BitReader::new(src,
src.len(),
BitReaderMode::BE);
+let mut br = BitReader::new(src, BitReaderMode::BE);
println!("edata:");
println!("{:08X}", br.read(32).unwrap());
println!("{:08X}", br.read(32).unwrap());
println!("edata:");
println!("{:08X}", br.read(32).unwrap());
println!("{:08X}", br.read(32).unwrap());