X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fimc.rs;h=ceac0d1062e33de26dbeb77b7bab7fc33b73d9e2;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hp=a48e43efdb2cbbad41bca7cb3a3ed7a2cff81ed5;hpb=3167c45c8087a692192021e08a8063dff680001c;p=nihav.git

diff --git a/nihav-indeo/src/codecs/imc.rs b/nihav-indeo/src/codecs/imc.rs
index a48e43e..ceac0d1 100644
--- a/nihav-indeo/src/codecs/imc.rs
+++ b/nihav-indeo/src/codecs/imc.rs
@@ -1,8 +1,6 @@
 use std::mem;
 use std::ptr;
 use std::f32::consts;
-use std::rc::Rc;
-use std::cell::RefCell;
 
 use nihav_core::formats::*;
 use nihav_core::frame::*;
@@ -323,7 +321,7 @@ struct IMCDecoder {
 
     chmap:  NAChannelMap,
     ainfo:  NAAudioInfo,
-    info:   Rc<NACodecInfo>,
+    info:   NACodecInfoRef,
 
     codes:  [[Codebook<u8>; 4]; 4],
     ch_data: [IMCChannel; 2],
@@ -867,7 +865,7 @@ const CHMAP_MONO: [NAChannelType; 1] = [NAChannelType::C];
 const CHMAP_STEREO: [NAChannelType; 2] = [NAChannelType::L, NAChannelType::R];
 
 impl NADecoder for IMCDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             self.chmap = NAChannelMap::new();
             match ainfo.get_channels() {
@@ -896,9 +894,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;
@@ -1121,11 +1119,11 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_codecs(&mut dec_reg);
 
-//        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";
+//        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);
     }