X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=b8a06d140f1ecd67ba987689b87430c699ed7af9;hb=03accf760cf79bc56d7c6dc6e82cd885fb7e1e13;hp=76bf3df8f50ae7c97f6a3fcbdcc8cafcc7ad8fd0;hpb=1a967e6bad5f17943b4de0607078eb940ad5adfe;p=nihav.git diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs index 76bf3df..b8a06d1 100644 --- a/nihav-realmedia/src/codecs/ralf.rs +++ b/nihav-realmedia/src/codecs/ralf.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::*; @@ -246,7 +244,7 @@ struct Block { const RALF_MAX_PACKET_SIZE: usize = 8192; struct RALFDecoder { - info: Rc, + info: NACodecInfoRef, chmap: NAChannelMap, channels: u8, @@ -357,7 +355,7 @@ fn read_block_length(br: &mut BitReader) -> DecoderResult { } impl NADecoder for RALFDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { let edata = info.get_extradata().unwrap(); @@ -419,7 +417,7 @@ impl NADecoder for RALFDecoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.replace_info(NACodecTypeInfo::Audio(ainfo)), NABufferType::None); frm.set_frame_type(FrameType::Skip); - return Ok(Rc::new(RefCell::new(frm))); + return Ok(frm.into_ref()); } src_len = pktbuf.len(); } @@ -467,7 +465,7 @@ impl NADecoder for RALFDecoder { 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()) } }