X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fatrac3.rs;h=9cc7dd4a79a536412c4356fd17f7866e30b1e685;hb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf;hp=3170c00cad92cb1163ad82fab3646c88ad9c4117;hpb=4f6124ac474e05ab343505444cdbb69b67829e2c;p=nihav.git

diff --git a/nihav-commonfmt/src/codecs/atrac3.rs b/nihav-commonfmt/src/codecs/atrac3.rs
index 3170c00..9cc7dd4 100644
--- a/nihav-commonfmt/src/codecs/atrac3.rs
+++ b/nihav-commonfmt/src/codecs/atrac3.rs
@@ -1,5 +1,3 @@
-use std::rc::Rc;
-use std::cell::RefCell;
 use nihav_core::formats::*;
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
@@ -387,7 +385,7 @@ impl DSP {
 }
 
 struct Atrac3Decoder {
-    info:       Rc<NACodecInfo>,
+    info:       NACodecInfoRef,
     channels:   usize,
     chmap:      NAChannelMap,
     samples:    usize,
@@ -555,7 +553,7 @@ fn interp(a: f32, b: f32, pos: usize) -> f32 {
 }
 
 impl NADecoder for Atrac3Decoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             self.info = info.clone();
             let edata = info.get_extradata().unwrap();
@@ -679,9 +677,9 @@ impl NADecoder for Atrac3Decoder {
 
         let ainfo = self.info.get_properties().get_audio_info().unwrap();
 
-        let mut abuf = alloc_audio_buffer(ainfo, ATRAC3_FRAME_SIZE, self.chmap.clone())?;
+        let abuf = alloc_audio_buffer(ainfo, ATRAC3_FRAME_SIZE, self.chmap.clone())?;
         let mut adata = abuf.get_abuf_f32().unwrap();
-        let mut output = adata.get_data_mut();
+        let output = adata.get_data_mut().unwrap();
 
         for ch in 0..self.channels {
             let dpos = abuf.get_offset(ch);
@@ -690,7 +688,7 @@ impl NADecoder for Atrac3Decoder {
 
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.replace_info(NACodecTypeInfo::Audio(ainfo)), abuf);
         frm.set_keyframe(true);
-        Ok(Rc::new(RefCell::new(frm)))
+        Ok(frm.into_ref())
     }
 }