X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion1.rs;h=c205b3cb9fee5fa51952f836338d60ecc4cb4fd5;hb=3fc28ece6664a34af9b7f6a52dbf8a8809fa9204;hp=b8edd4e383050ce4b5bbdeaaec3fdd91987151df;hpb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf;p=nihav.git diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs index b8edd4e..c205b3c 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 }