}
struct FrameBuf {
- last16: Option<NAVideoBuffer<u16>>,
- last24: Option<NAVideoBuffer<u8>>,
+ last16: Option<NAVideoBufferRef<u16>>,
+ last24: Option<NAVideoBufferRef<u8>>,
}
impl FrameBuf {
- fn set16(&mut self, buf: NAVideoBuffer<u16>) { self.last16 = Some(buf); }
- fn set24(&mut self, buf: NAVideoBuffer<u8>) { self.last24 = Some(buf); }
- fn get16(&mut self) -> Option<NAVideoBuffer<u16>> {
+ fn set16(&mut self, buf: NAVideoBufferRef<u16>) { self.last16 = Some(buf); }
+ fn set24(&mut self, buf: NAVideoBufferRef<u8>) { self.last24 = Some(buf); }
+ fn get16(&mut self) -> Option<NAVideoBufferRef<u16>> {
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<NAVideoBuffer<u8>> {
+ fn get24(&mut self) -> Option<NAVideoBufferRef<u8>> {
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
}
}
impl NADecoder for TM1Decoder {
- fn init(&mut self, info: NACodecInfoRef) -> 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 = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
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();
validate!(src.len() > 10);
let hdr_size = (src[0].rotate_left(3) & 0x7F) as usize;
}
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
Box::new(TM1Decoder::new())
}