diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2019-04-28 15:15:50 +0200 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2019-04-28 15:15:50 +0200 |
commit | 1a967e6bad5f17943b4de0607078eb940ad5adfe (patch) | |
tree | f4f88a32dbe9c42d736130b493bc5a7ce308d20e /nihav-duck/src | |
parent | 3c38de0f394218a267cf15edda331dc4f2ed61bb (diff) | |
download | nihav-1a967e6bad5f17943b4de0607078eb940ad5adfe.tar.gz |
switch to refcounted buffers
Diffstat (limited to 'nihav-duck/src')
-rw-r--r-- | nihav-duck/src/codecs/dkadpcm.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/truemotion1.rs | 4 | ||||
-rw-r--r-- | nihav-duck/src/codecs/truemotion2.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/truemotion2x.rs | 2 | ||||
-rw-r--r-- | nihav-duck/src/codecs/truemotionrt.rs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nihav-duck/src/codecs/dkadpcm.rs b/nihav-duck/src/codecs/dkadpcm.rs index 68969da..0410957 100644 --- a/nihav-duck/src/codecs/dkadpcm.rs +++ b/nihav-duck/src/codecs/dkadpcm.rs @@ -81,7 +81,7 @@ impl NADecoder for DuckADPCMDecoder { let mut adata = abuf.get_abuf_i16().unwrap(); let mut off0 = adata.get_offset(0); let mut off1 = adata.get_offset(1); - let mut dst = adata.get_data_mut(); + let dst = adata.get_data_mut().unwrap(); for blk in pktbuf.chunks_exact(self.block_len) { let mut mr = MemoryReader::new_read(blk); diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs index eae23d4..a156705 100644 --- a/nihav-duck/src/codecs/truemotion1.rs +++ b/nihav-duck/src/codecs/truemotion1.rs @@ -625,7 +625,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 { @@ -644,7 +644,7 @@ impl NADecoder for TM1Decoder { 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); diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs index 3419d93..54f0d30 100644 --- a/nihav-duck/src/codecs/truemotion2.rs +++ b/nihav-duck/src/codecs/truemotion2.rs @@ -520,7 +520,7 @@ impl TM2Decoder { fmt.get_chromaton(1).unwrap().get_offset() as usize, fmt.get_chromaton(2).unwrap().get_offset() as usize]; let stride = buf.get_stride(0); - let mut data = buf.get_data_mut(); + let data = buf.get_data_mut().unwrap(); let dst = data.as_mut_slice(); let mut off = 0; diff --git a/nihav-duck/src/codecs/truemotion2x.rs b/nihav-duck/src/codecs/truemotion2x.rs index 4fa1b44..6eb3559 100644 --- a/nihav-duck/src/codecs/truemotion2x.rs +++ b/nihav-duck/src/codecs/truemotion2x.rs @@ -180,7 +180,7 @@ impl TM2XDecoder { fn output_frame(&mut self, buf: &mut NAVideoBuffer<u8>) { let mut offs = [ buf.get_offset(0), buf.get_offset(1), buf.get_offset(2) ]; let strides = [ buf.get_stride(0), buf.get_stride(1), buf.get_stride(2) ]; - let mut data = buf.get_data_mut(); + let data = buf.get_data_mut().unwrap(); let dst = data.as_mut_slice(); let mut pos = self.cur_frame.stride; diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs index a4ea0ac..df17047 100644 --- a/nihav-duck/src/codecs/truemotionrt.rs +++ b/nihav-duck/src/codecs/truemotionrt.rs @@ -72,7 +72,7 @@ impl NADecoder for TMRTDecoder { let (w, h) = buf.get_dimensions(plane); let off = buf.get_offset(plane); let stride = buf.get_stride(plane); - let mut data = buf.get_data_mut(); + let data = buf.get_data_mut().unwrap(); let dst = data.as_mut_slice(); self.decode_plane(&mut br, dst, off, stride, w, h, hscale, dbits, plane > 0)?; } |