X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv40.rs;fp=nihav-realmedia%2Fsrc%2Fcodecs%2Frv40.rs;h=eb45164401e6ed50127968d7f9549f995ba0e793;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hp=d664dce8d343f9867e40b0bb6925ef646e3fc017;hpb=cd830591a8770b4a56ce9b938574adcee3ed33f5;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv40.rs b/nihav-realmedia/src/codecs/rv40.rs index d664dce..eb45164 100644 --- a/nihav-realmedia/src/codecs/rv40.rs +++ b/nihav-realmedia/src/codecs/rv40.rs @@ -1,5 +1,3 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::formats; use nihav_core::frame::*; use nihav_core::io::bitreader::*; @@ -301,7 +299,7 @@ impl RV34BitstreamDecoder for RealVideo40BR { struct RealVideo40Decoder { bd: RealVideo40BR, - info: Rc, + info: NACodecInfoRef, dec: RV34Decoder, } @@ -309,18 +307,18 @@ impl RealVideo40Decoder { fn new() -> Self { RealVideo40Decoder{ bd: RealVideo40BR::new(), - info: Rc::new(DUMMY_CODEC_INFO), + info: NACodecInfoRef::default(), dec: RV34Decoder::new(false, Box::new(RV40DSP::new())), } } } impl NADecoder for RealVideo40Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let fmt = formats::YUV420_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(0, 0, false, fmt)); - self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata())); + self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); let edata = info.get_extradata().unwrap(); let src: &[u8] = &edata;