X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion1.rs;h=c313b137677407dd1fa8cbff619f16404e365a18;hb=f9be4e750dccff762b9a3d894faec50ffdb59233;hp=eae23d4aff70bd376d3072d85313b4cecf3fa1ad;hpb=b70cc0062fd4d791ee20f23439a3b08a04921835;p=nihav.git diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs index eae23d4..c313b13 100644 --- a/nihav-duck/src/codecs/truemotion1.rs +++ b/nihav-duck/src/codecs/truemotion1.rs @@ -129,27 +129,27 @@ impl Default for DeltaTables { } struct FrameBuf { - last16: Option>, - last24: Option>, + last16: Option>, + last24: Option>, } impl FrameBuf { - fn set16(&mut self, buf: NAVideoBuffer) { self.last16 = Some(buf); } - fn set24(&mut self, buf: NAVideoBuffer) { self.last24 = Some(buf); } - fn get16(&mut self) -> Option> { + fn set16(&mut self, buf: NAVideoBufferRef) { self.last16 = Some(buf); } + fn set24(&mut self, buf: NAVideoBufferRef) { self.last24 = Some(buf); } + fn get16(&mut self) -> Option> { if let Some(ref mut frm) = self.last16 { let newfrm = frm.copy_buffer(); - *frm = newfrm.clone(); - Some(newfrm) + *frm = newfrm.clone().into_ref(); + Some(newfrm.into_ref()) } else { None } } - fn get24(&mut self) -> Option> { + fn get24(&mut self) -> Option> { if let Some(ref mut frm) = self.last24 { let newfrm = frm.copy_buffer(); - *frm = newfrm.clone(); - Some(newfrm) + *frm = newfrm.clone().into_ref(); + Some(newfrm.into_ref()) } else { None } @@ -168,7 +168,7 @@ impl Default for FrameBuf { #[derive(Default)] struct TM1Decoder { - info: Rc, + info: NACodecInfoRef, last_delta_set: usize, last_table_idx: usize, delta_tables: DeltaTables, @@ -203,7 +203,7 @@ impl TM1Decoder { let cfdt = DUCK_C_FAT_DELTAS[delta_set]; let vec = DUCK_VECTABLES[table_idx - 1]; - let mut vec_iter = vec.into_iter(); + let mut vec_iter = vec.iter(); for i in 0..256 { let len = (*vec_iter.next().unwrap() as usize) >> 1; for j in 0..len { @@ -315,9 +315,9 @@ impl TM1Decoder { _ => unreachable!(), }; } else { - let cur = (dst[off + x + 0] as u32) | ((dst[off + x + 1] as u32) << 16); + let cur = u32::from(dst[off + x + 0]) | (u32::from(dst[off + x + 1]) << 16); self.vert_pred[(x >> 1) + 0] = cur; - let cur = (dst[off + x + 2] as u32) | ((dst[off + x + 3] as u32) << 16); + let cur = u32::from(dst[off + x + 2]) | (u32::from(dst[off + x + 3]) << 16); hor_pred = cur.wrapping_sub(self.vert_pred[(x >> 1) + 1]); self.vert_pred[(x >> 1) + 1] = cur; } @@ -490,15 +490,15 @@ impl TM1Decoder { _ => unreachable!(), }; } else { - let cur = (dst[off + x*4 + 0] as u32) - | ((dst[off + x*4 + 1] as u32) << 8) - | ((dst[off + x*4 + 2] as u32) << 16) - | ((dst[off + x*4 + 3] as u32) << 24); + let cur = u32::from(dst[off + x*4 + 0]) + | (u32::from(dst[off + x*4 + 1]) << 8) + | (u32::from(dst[off + x*4 + 2]) << 16) + | (u32::from(dst[off + x*4 + 3]) << 24); self.vert_pred[x + 0] = cur; - let cur = (dst[off + x*4 + 4] as u32) - | ((dst[off + x*4 + 5] as u32) << 8) - | ((dst[off + x*4 + 6] as u32) << 16) - | ((dst[off + x*4 + 7] as u32) << 24); + let cur = u32::from(dst[off + x*4 + 4]) + | (u32::from(dst[off + x*4 + 5]) << 8) + | (u32::from(dst[off + x*4 + 6]) << 16) + | (u32::from(dst[off + x*4 + 7]) << 24); hor_pred = cur.wrapping_sub(self.vert_pred[x + 1]); self.vert_pred[x + 1] = cur; } @@ -515,16 +515,16 @@ impl TM1Decoder { } impl NADecoder for TM1Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, 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) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() > 10); let hdr_size = (src[0].rotate_left(3) & 0x7F) as usize; @@ -578,7 +578,7 @@ impl NADecoder for TM1Decoder { 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; @@ -605,9 +605,7 @@ impl NADecoder for TM1Decoder { if is_intra || is_sprite { let fmt = if is_24bit { BGR0_FORMAT } else { RGB555_FORMAT }; 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 bufinfo = bufret.unwrap(); + let bufinfo = alloc_video_buffer(myinfo, 2)?; self.lastframe.reset(); if !is_24bit { self.lastframe.set16(bufinfo.get_vbuf16().unwrap()); @@ -625,7 +623,7 @@ impl NADecoder for TM1Decoder { 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 { @@ -640,27 +638,28 @@ impl NADecoder for TM1Decoder { } else { return Err(DecoderError::MissingReference); } - } else { - if let Some(mut buf) = self.lastframe.get24() { - let stride = buf.get_stride(0); - { - let mut data = buf.get_data_mut(); - self.decode_24bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?; - } - bufinfo = NABufferType::VideoPacked(buf); - } else { - return Err(DecoderError::MissingReference); + } else if let Some(mut buf) = self.lastframe.get24() { + let stride = buf.get_stride(0); + { + 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); + } else { + return Err(DecoderError::MissingReference); } 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()) + } + fn flush(&mut self) { + self.lastframe.reset(); } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(TM1Decoder::new()) }