X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fra144.rs;h=07d234a6dddf4823bdbd90a4516c4cf26cc84552;hb=03accf760cf79bc56d7c6dc6e82cd885fb7e1e13;hp=19cf38b841c713b8b84ea54bfec055c36ac69e11;hpb=1a967e6bad5f17943b4de0607078eb940ad5adfe;p=nihav.git diff --git a/nihav-realmedia/src/codecs/ra144.rs b/nihav-realmedia/src/codecs/ra144.rs index 19cf38b..07d234a 100644 --- a/nihav-realmedia/src/codecs/ra144.rs +++ b/nihav-realmedia/src/codecs/ra144.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::*; @@ -14,7 +12,7 @@ const FRAME_SIZE: usize = 20; struct RA144Decoder { chmap: NAChannelMap, ainfo: NAAudioInfo, - info: Rc, + info: NACodecInfoRef, old_energy: u16, lpc_data: [[i32; LPC_ORDER]; 2], @@ -244,7 +242,7 @@ fn clip_out(sample: i16) -> i16 { } impl NADecoder for RA144Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { self.chmap.add_channels(&CHMAP_MONO); self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), @@ -307,7 +305,7 @@ impl NADecoder for RA144Decoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), abuf); frm.set_keyframe(true); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) } }