X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv10.rs;h=320968ad689e9bf11c05d920996229ed3621e3d3;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=9184b5718b5c735a73d42c0c96f1f0512264fe8c;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv10.rs b/nihav-realmedia/src/codecs/rv10.rs index 9184b57..320968a 100644 --- 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 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(); @@ -76,7 +76,7 @@ impl<'a> RealVideo10BR<'a> { } 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, @@ -425,7 +425,7 @@ println!("ver {:06X} -> {}", ver, mic_ver); 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()); @@ -455,7 +455,7 @@ println!("???"); } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(RealVideo10Decoder::new()) } @@ -464,8 +464,8 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_core::test::dec_video::*; - use crate::codecs::realmedia_register_all_codecs; - use crate::demuxers::realmedia_register_all_demuxers; + use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_demuxers; #[test] fn test_rv10() { let mut dmx_reg = RegisteredDemuxers::new();