-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::io::bitreader::*;
use nihav_core::io::codebook::*;
use nihav_core::formats;
}
struct Indeo2Decoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
cb: Codebook<u8>,
frmmgr: HAMShuffler,
}
impl Indeo2Decoder {
fn new() -> Self {
- let dummy_info = Rc::new(DUMMY_CODEC_INFO);
+ let dummy_info = NACodecInfo::new_dummy();
let mut coderead = IR2CodeReader{};
let cb = Codebook::new(&mut coderead, CodebookMode::LSB).unwrap();
Indeo2Decoder { info: dummy_info, cb: cb, frmmgr: HAMShuffler::new() }
let stride = buf.get_stride(planeno);
let cb = &self.cb;
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let framebuf: &mut [u8] = data.as_mut_slice();
let table = &INDEO2_DELTA_TABLE[tableno];
let stride = buf.get_stride(planeno);
let cb = &self.cb;
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let framebuf: &mut [u8] = data.as_mut_slice();
let table = &INDEO2_DELTA_TABLE[tableno];
const IR2_START: usize = 48;
impl NADecoder for Indeo2Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let w = vinfo.get_width();
let h = vinfo.get_height();
let f = vinfo.is_flipped();
let fmt = formats::YUV410_FORMAT;
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(w, h, f, 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();
self.frmmgr.clear();
Ok(())
} else {
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
if src.len() <= IR2_START { return Err(DecoderError::ShortData); }
let interframe = src[18];
let vinfo = self.info.get_properties().get_video_info().unwrap();
let bufret = alloc_video_buffer(vinfo, 2);
if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let mut bufinfo = bufret.unwrap();
+ let bufinfo = bufret.unwrap();
let mut buf = bufinfo.get_vbuf().unwrap();
for plane in 0..3 {
let tabidx = (if plane == 0 { luma_tab } else { chroma_tab }) as usize;
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_keyframe(true);
frm.set_frame_type(FrameType::I);
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
} else {
let bufret = self.frmmgr.clone_ref();
if let None = bufret { return Err(DecoderError::MissingReference); }
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::Video(buf));
frm.set_keyframe(false);
frm.set_frame_type(FrameType::P);
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
}
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
Box::new(Indeo2Decoder::new())
}
let mut dec_reg = RegisteredDecoders::new();
indeo_register_all_codecs(&mut dec_reg);
- test_file_decoding("avi", "assets/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+ test_file_decoding("avi", "assets/Indeo/laser05.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
}
}