#[derive(Default)]
struct TM1Decoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
last_delta_set: usize,
last_table_idx: usize,
delta_tables: DeltaTables,
}
impl NADecoder for TM1Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, YUV410_FORMAT));
- 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)
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None);
frm.set_keyframe(false);
frm.set_frame_type(FrameType::Skip);
- return Ok(Rc::new(RefCell::new(frm)));
+ return Ok(frm.into_ref());
}
let compr_info = cinfo.unwrap();
let is_24bit = !is_sprite && compr_info.is_24bit;
let myinfo = NAVideoInfo::new(out_width, height, false, fmt);
let bufret = alloc_video_buffer(myinfo, 2);
if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let mut bufinfo = bufret.unwrap();
+ let bufinfo = bufret.unwrap();
self.lastframe.reset();
if !is_24bit {
self.lastframe.set16(bufinfo.get_vbuf16().unwrap());
if let Some(mut buf) = self.lastframe.get16() {
let stride = buf.get_stride(0);
{
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
if !is_sprite {
self.decode_16bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
} else {
if let Some(mut buf) = self.lastframe.get24() {
let stride = buf.get_stride(0);
{
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
self.decode_24bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
}
bufinfo = NABufferType::VideoPacked(buf);
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_keyframe(is_intra || is_sprite);
frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
}