X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fintel263.rs;h=3b95c5fa8e4f52466e84323a1a1a27051e77f09d;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hp=d84aff51c9f99a2d8a9c7623e6d897e1ee9a2246;hpb=1678d59a37c619e7a3a2604f4bd23bb10c1769f6;p=nihav.git diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs index d84aff5..3b95c5f 100644 --- a/nihav-indeo/src/codecs/intel263.rs +++ b/nihav-indeo/src/codecs/intel263.rs @@ -1,5 +1,3 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::formats; @@ -21,7 +19,7 @@ struct Tables { } struct Intel263Decoder { - info: Rc, + info: NACodecInfoRef, dec: H263BaseDecoder, tables: Tables, bdsp: H263BlockDSP, @@ -357,7 +355,7 @@ impl Intel263Decoder { }; Intel263Decoder{ - info: Rc::new(DUMMY_CODEC_INFO), + info: NACodecInfo::new_dummy(), dec: H263BaseDecoder::new(true), tables: tables, bdsp: H263BlockDSP::new(), @@ -366,13 +364,13 @@ impl Intel263Decoder { } impl NADecoder for Intel263Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); let fmt = formats::YUV420_FORMAT; let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, 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(); Ok(()) } else { Err(DecoderError::InvalidData)