switch to refcounted buffers

[nihav.git] / nihav-indeo / src / codecs / imc.rs

diff --git a/nihav-indeo/src/codecs/imc.rs b/nihav-indeo/src/codecs/imc.rs
index 5840846e9ef81b1643e1fb0960b48f75d21bd227..2d65a7c954c15752804834c5558dd2a2769d2703 100644 (file)
--- a/nihav-indeo/src/codecs/imc.rs
+++ b/nihav-indeo/src/codecs/imc.rs
@@ -896,9 +896,9 @@ impl NADecoder for IMCDecoder {
         let nblocks = pktbuf.len() / BLOCK_SIZE / (self.ainfo.get_channels() as usize);
         let duration = COEFFS * 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_f32().unwrap();
-        let mut dst = adata.get_data_mut();
+        let dst = adata.get_data_mut().unwrap();
 
         let mut start: usize = 0;
         let channels = self.ainfo.get_channels() as usize;
@@ -1109,15 +1109,24 @@ const IMC_CB_SELECTOR: [[usize; BANDS]; 4] = [
 
 #[cfg(test)]
 mod test {
-    use crate::test::dec_video::*;
+    use nihav_core::codecs::RegisteredDecoders;
+    use nihav_core::demuxers::RegisteredDemuxers;
+    use nihav_core::test::dec_video::*;
+    use crate::codecs::indeo_register_all_codecs;
+    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
     #[test]
     fn test_imc() {
-//        let file = "assets/neal73_saber.avi";
-//        let file = "assets/IMC/hvalen.avi";
-        let file = "assets/IMC/8khz.avi";
-//        let file = "assets/STsKlassFist-1a.avi";
-//        let file = "assets/IMC/Angel Bday.avi";
-        test_decode_audio("avi", file, None, "imc");
+        let mut dmx_reg = RegisteredDemuxers::new();
+        generic_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        indeo_register_all_codecs(&mut dec_reg);
+
+//        let file = "assets/Indeo/neal73_saber.avi";
+//        let file = "assets/Indeo/IMC/hvalen.avi";
+        let file = "assets/Indeo/IMC/8khz.avi";
+//        let file = "assets/Indeo/STsKlassFist-1a.avi";
+//        let file = "assets/Indeo/IMC/Angel Bday.avi";
+        test_decode_audio("avi", file, None, "imc", &dmx_reg, &dec_reg);
         //test_file_decoding("avi", file, None, false, true, None);
     }
 }