aboutsummaryrefslogtreecommitdiffstats
path: root/nihav-rad
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2020-02-11 12:31:35 +0100
committerKostya Shishkov <kostya.shishkov@gmail.com>2020-02-11 12:31:35 +0100
commitfa90ccfb8676a917a02fbb56381f86aa1962d313 (patch)
treeb9a8787d975720c99a23e908a3ef448fbab45530 /nihav-rad
parent5b9e314dc124b8325325f940d7863d39c012dd2e (diff)
downloadnihav-fa90ccfb8676a917a02fbb56381f86aa1962d313.tar.gz
Make BitReader rely on passed slice size without the additional arguments.
Diffstat (limited to 'nihav-rad')
-rw-r--r--nihav-rad/src/codecs/bink2.rs2
-rw-r--r--nihav-rad/src/codecs/binkaud.rs2
-rw-r--r--nihav-rad/src/codecs/binkvid.rs2
-rw-r--r--nihav-rad/src/codecs/smacker.rs6
4 files changed, 6 insertions, 6 deletions
diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs
index 1ce05dd..9375bfa 100644
--- a/nihav-rad/src/codecs/bink2.rs
+++ b/nihav-rad/src/codecs/bink2.rs
@@ -1921,7 +1921,7 @@ impl NADecoder for Bink2Decoder {
fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
- let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(&src, BitReaderMode::LE);
let mut buf;
self.key_frame = pkt.is_keyframe();
diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index 9695ee4..48bc508 100644
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -234,7 +234,7 @@ impl NADecoder for BinkAudioDecoder {
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
validate!(pktbuf.len() > 1);
- let mut br = BitReader::new(&pktbuf, pktbuf.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(&pktbuf, BitReaderMode::LE);
let nsamples = br.read(32)? as usize;
// validate!(nsamples % self.duration == 0);
diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs
index 89f9cf8..545c10e 100644
--- a/nihav-rad/src/codecs/binkvid.rs
+++ b/nihav-rad/src/codecs/binkvid.rs
@@ -1209,7 +1209,7 @@ impl NADecoder for BinkDecoder {
fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
- let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(&src, BitReaderMode::LE);
let mut buf;
self.key_frame = pkt.is_keyframe();
diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index c22362b..86b022c 100644
--- a/nihav-rad/src/codecs/smacker.rs
+++ b/nihav-rad/src/codecs/smacker.rs
@@ -413,7 +413,7 @@ impl NADecoder for SmackerVideoDecoder {
let type_size = br.read_u32le()?;
self.is_ver4 = (magic & 0xFF) == 0x34;
- let mut br = BitReader::new(&edata[24..], edata.len() - 24, BitReaderMode::LE);
+ let mut br = BitReader::new(&edata[24..], BitReaderMode::LE);
self.mmap_tree.decode(&mut br, mmap_size)?;
self.mclr_tree.decode(&mut br, mclr_size)?;
self.full_tree.decode(&mut br, full_size)?;
@@ -442,7 +442,7 @@ impl NADecoder for SmackerVideoDecoder {
let ftype;
let bufinfo;
if src.len() > PAL_SIZE {
- let mut br = BitReader::new(&src[PAL_SIZE..], src.len() - PAL_SIZE, BitReaderMode::LE);
+ let mut br = BitReader::new(&src[PAL_SIZE..], BitReaderMode::LE);
bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?;
let mut buf = bufinfo.get_vbuf().unwrap();
@@ -509,7 +509,7 @@ impl NADecoder for SmackerAudioDecoder {
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let src = pkt.get_buffer();
validate!(src.len() > 4);
- let mut br = BitReader::new(&src, src.len(), BitReaderMode::LE);
+ let mut br = BitReader::new(&src, BitReaderMode::LE);
let unp_size = br.read(32)? as usize;
if !br.read_bool()? {
let mut frm = NAFrame::new_from_pkt(pkt, info.clone(), NABufferType::None);