X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fatrac3.rs;h=42fbe8a708fe053d15d0bf20bcc27589c2bcb4be;hp=66751b3a2a297d752af6a1223bfc07bd6ba9f6d1;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hpb=b70cc0062fd4d791ee20f23439a3b08a04921835 diff --git a/nihav-commonfmt/src/codecs/atrac3.rs b/nihav-commonfmt/src/codecs/atrac3.rs index 66751b3..42fbe8a 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, + 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) -> 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(); @@ -681,7 +679,7 @@ impl NADecoder for Atrac3Decoder { 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);