X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fsmacker.rs;h=650fddde8d2b44944cb9b373d49658429faba8ba;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=bc27ab0b31a6616d5761c6cf97d1d319f5d911ca;hpb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;p=nihav.git

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index bc27ab0..650fddd 100644
--- a/nihav-rad/src/codecs/smacker.rs
+++ b/nihav-rad/src/codecs/smacker.rs
@@ -387,7 +387,7 @@ impl SmackerVideoDecoder {
 }
 
 impl NADecoder for SmackerVideoDecoder {
-    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             let w = vinfo.get_width();
             let h = vinfo.get_height();
@@ -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)?;
@@ -434,7 +434,7 @@ impl NADecoder for SmackerVideoDecoder {
             Err(DecoderError::InvalidData)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let src = pkt.get_buffer();
         validate!(src.len() >= PAL_SIZE);
 
@@ -442,11 +442,9 @@ 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);
 
-            let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2);
-            if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-            bufinfo = bufret.unwrap();
+            bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?;
             let mut buf = bufinfo.get_vbuf().unwrap();
             is_intra = self.decode_frame(&mut br)?;
             self.output_frame(&mut buf);
@@ -465,11 +463,13 @@ impl NADecoder for SmackerVideoDecoder {
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
         frm.set_keyframe(is_intra);
         frm.set_frame_type(ftype);
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
+    }
+    fn flush(&mut self) {
     }
 }
 
-pub fn get_decoder_video() -> Box<NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
     Box::new(SmackerVideoDecoder::new())
 }
 
@@ -492,7 +492,7 @@ impl SmackerAudioDecoder {
 }
 
 impl NADecoder for SmackerAudioDecoder {
-    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             self.bits = ainfo.get_format().get_bits();
             let fmt = if self.bits == 8 { SND_U8_FORMAT } else { SND_S16P_FORMAT };
@@ -504,17 +504,17 @@ impl NADecoder for SmackerAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let info = pkt.get_stream().get_info();
         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);
                 frm.set_frame_type(FrameType::Skip);
-                return Ok(Rc::new(RefCell::new(frm)));
+                return Ok(frm.into_ref());
             }
             let stereo                          = br.read_bool()?;
             let bits16                          = br.read_bool()?;
@@ -586,14 +586,16 @@ impl NADecoder for SmackerAudioDecoder {
             let mut frm = NAFrame::new_from_pkt(pkt, info, abuf);
             frm.set_duration(Some(samples as u64));
             frm.set_keyframe(false);
-            Ok(Rc::new(RefCell::new(frm)))
+            Ok(frm.into_ref())
         } else {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_audio() -> Box<NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
     Box::new(SmackerAudioDecoder::new())
 }
 
@@ -601,9 +603,9 @@ pub fn get_decoder_audio() -> Box<NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::rad_register_all_codecs;
-    use crate::demuxers::rad_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::rad_register_all_codecs;
+    use crate::rad_register_all_demuxers;
     #[test]
     fn test_smkvid() {
         let mut dmx_reg = RegisteredDemuxers::new();
@@ -626,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);
     }
 }