X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fsmacker.rs;h=86b022c67d2cd85ec58a3296baf2331e651b4658;hb=fa90ccfb8676a917a02fbb56381f86aa1962d313;hp=99d40d68b4bd5dc9fac5936bf5e4b121ca740616;hpb=7e6086e50dce8780e59c8d9c0d2d74aa25aaae9e;p=nihav.git

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index 99d40d6..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();
@@ -465,9 +465,11 @@ impl NADecoder for SmackerVideoDecoder {
         frm.set_frame_type(ftype);
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
     Box::new(SmackerVideoDecoder::new())
 }
 
@@ -507,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);
@@ -589,9 +591,11 @@ impl NADecoder for SmackerAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
     Box::new(SmackerAudioDecoder::new())
 }
 
@@ -624,6 +628,6 @@ mod test {
 
         //let file = "assets/RAD/20130507_audio-distortion.smk";
         let file = "assets/RAD/wetlogo.smk";
-        test_decode_audio("smacker", file, None, "smk", &dmx_reg, &dec_reg);
+        test_decode_audio("smacker", file, None, None/*Some("smk")*/, &dmx_reg, &dec_reg);
     }
 }