switch NACodecInfo to Arc

[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..0104b306d9e8f622743537f4e3f104f5f5469fbc 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, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             validate!(ainfo.get_block_len() > 16);
             self.block_len = ainfo.get_block_len();
@@ -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);