mark traits as dyn

[nihav.git] / nihav-duck / src / codecs / dkadpcm.rs

diff --git a/nihav-duck/src/codecs/dkadpcm.rs b/nihav-duck/src/codecs/dkadpcm.rs
index 64b750fef81f01859dfbf3b5fbc59a568d7ad4a5..b5871ab8d64090a2ac7c6ba1e7ff1e8b03d79f8d 100644 (file)
--- a/nihav-duck/src/codecs/dkadpcm.rs
+++ b/nihav-duck/src/codecs/dkadpcm.rs
@@ -51,7 +51,7 @@ impl DuckADPCMDecoder {
 }
 
 impl NADecoder for DuckADPCMDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             validate!(ainfo.get_block_len() > 16);
             self.block_len = ainfo.get_block_len();
@@ -69,7 +69,7 @@ impl NADecoder for DuckADPCMDecoder {
             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 pktbuf = pkt.get_buffer();
@@ -77,11 +77,11 @@ impl NADecoder for DuckADPCMDecoder {
             let nblocks = pktbuf.len() / self.block_len;
             let out_block_len = self.ainfo.get_block_len();
             let duration = out_block_len * nblocks;
-            let mut abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
+            let abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
             let mut adata = abuf.get_abuf_i16().unwrap();
             let mut off0 = adata.get_offset(0);
             let mut off1 = adata.get_offset(1);
-            let mut dst = adata.get_data_mut();
+            let dst = adata.get_data_mut().unwrap();
 
             for blk in pktbuf.chunks_exact(self.block_len) {
                 let mut mr = MemoryReader::new_read(blk);
@@ -158,18 +158,18 @@ impl NADecoder for DuckADPCMDecoder {
             let mut frm = NAFrame::new_from_pkt(pkt, info, abuf);
             frm.set_duration(Some(duration as u64));
             frm.set_keyframe(false);
-            Ok(Rc::new(RefCell::new(frm)))
+            Ok(frm.into_ref())
         } else {
             Err(DecoderError::InvalidData)
         }
     }
 }
 
-pub fn get_decoder_dk3() -> Box<NADecoder> {
+pub fn get_decoder_dk3() -> Box<dyn NADecoder> {
     Box::new(DuckADPCMDecoder::new(true))
 }
 
-pub fn get_decoder_dk4() -> Box<NADecoder> {
+pub fn get_decoder_dk4() -> Box<dyn NADecoder> {
     Box::new(DuckADPCMDecoder::new(false))
 }