replace vec.truncate(0) with vec.clear()

[nihav.git] / nihav-indeo / src / codecs / indeo3.rs

diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs
index c9296f6d1515ade6c91a1725fc325b613f301c9e..9e0ee1155320149a5556de96c10f9918d9c27921 100644 (file)
--- a/nihav-indeo/src/codecs/indeo3.rs
+++ b/nihav-indeo/src/codecs/indeo3.rs
@@ -31,8 +31,8 @@ impl Buffers {
     fn reset(&mut self) {
         self.width  = 0;
         self.height = 0;
-        self.sbuf.truncate(0);
-        self.dbuf.truncate(0);
+        self.sbuf.clear();
+        self.dbuf.clear();
     }
     fn alloc(&mut self, w: usize, h: usize) {
         self.width  = w;
@@ -76,7 +76,7 @@ impl Buffers {
         let mut sidx = soff;
         let mut didx = doff;
         for _ in 0..h {
-            for i in 0..w { self.dbuf[didx + i] = self.sbuf[sidx + i]; }
+            self.dbuf[didx..][..w].copy_from_slice(&self.sbuf[sidx..][..w]);
             sidx += stride;
             didx += stride;
         }
@@ -92,7 +92,7 @@ impl Buffers {
         } else {
             for i in 0..w { buf[i] = self.dbuf[didx - stride + i]; }
             for _ in 0..h {
-                for i in 0..w { self.dbuf[didx + i] = buf[i]; }
+                self.dbuf[didx..][..w].copy_from_slice(&buf[..w]);
                 didx += stride;
             }
         }
@@ -153,12 +153,12 @@ fn copy_line_top(bufs: &mut Buffers, off: usize, stride: usize, bw: usize, topli
     let mut buf: [u8; 8] = [0; 8];
     if !topline {
         let src = &bufs.dbuf[(off - stride)..(off - stride + bw)];
-        for i in 0..bw { buf[i] = src[i]; }
+        buf[..bw].copy_from_slice(&src[..bw]);
     } else {
         for i in 0..bw { buf[i] = DEFAULT_PIXEL; }
     }
     let dst = &mut bufs.dbuf[off..][..bw];
-    for i in 0..bw { dst[i] = buf[i]; }
+    dst.copy_from_slice(&buf[..bw]);
 }
 
 fn copy_line_top4x4(bufs: &mut Buffers, off: usize, stride: usize, topline: bool) {
@@ -179,7 +179,7 @@ fn copy_line_top8x8(bufs: &mut Buffers, off: usize, stride: usize, topline: bool
         for i in 0..8 { buf[i] = DEFAULT_PIXEL; }
     }
     let dst = &mut bufs.dbuf[off..][..8];
-    for i in 0..8 {dst[i] = buf[i]; }
+    dst.copy_from_slice(&buf[..8]);
 }
 
 fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topline: bool, firstline: bool) {
@@ -200,7 +200,7 @@ fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topli
         didx += stride;
     }
     for _ in start..h {
-        for i in 0..8 { bufs.dbuf[didx + i] = buf[i]; }
+        bufs.dbuf[didx..][..8].copy_from_slice(&buf[..8]);
         didx += stride;
     }
 }
@@ -325,6 +325,7 @@ impl Indeo3Decoder {
         Ok((self.bbuf >> self.bpos) & 0x3)
     }
 
+    #[allow(clippy::cognitive_complexity)]
     fn decode_cell_data(&mut self, br: &mut ByteReader, cell: IV3Cell,
                         off: usize, stride: usize, params: CellDecParams, vq_idx: u8) -> DecoderResult<()> {
         let blk_w = cell.w * 4 / params.bw;
@@ -634,7 +635,7 @@ impl Indeo3Decoder {
 
         let nvec = br.read_u32le()?;
         validate!(nvec == 0); // for intra there should be no mc_vecs
-        self.mvs.truncate(0);
+        self.mvs.clear();
         for _ in 0..nvec {
             let x = br.read_byte()? as i8;
             let y = br.read_byte()? as i8;
@@ -661,7 +662,7 @@ impl Indeo3Decoder {
 
         let nvec = br.read_u32le()?;
         validate!(nvec <= 256); // for intra there should be no mc_vecs
-        self.mvs.truncate(0);
+        self.mvs.clear();
         for _ in 0..nvec {
             let y = br.read_byte()? as i8;
             let x = br.read_byte()? as i8;
@@ -732,8 +733,12 @@ impl NADecoder for Indeo3Decoder {
         validate!((width  >= 16) && (width  <= 640));
         validate!((height >= 16) && (height <= 640));
         validate!(((width & 3) == 0) && ((height & 3) == 0));
+        let vinfo;
         if (self.bufs.width != (width as usize)) || (self.bufs.height != (height as usize)) {
             self.bufs.alloc(width as usize, height as usize);
+            vinfo = NAVideoInfo::new(width as usize, height as usize, false, formats::YUV410_FORMAT);
+        } else {
+            vinfo = self.info.get_properties().get_video_info().unwrap();
         }
         self.width  = width;
         self.height = height;
@@ -759,9 +764,6 @@ impl NADecoder for Indeo3Decoder {
         if (uoff < vend) && (uoff > voff) { vend = uoff; }
 
         let intraframe = (flags & FLAG_KEYFRAME) != 0;
-        let vinfo = self.info.get_properties().get_video_info().unwrap();
-        validate!((vinfo.get_width() & !3) == (self.width & !3).into());
-        validate!((vinfo.get_height() & !3) == (self.height & !3).into());
         let bufinfo = alloc_video_buffer(vinfo, 4)?;
         let mut buf = bufinfo.get_vbuf().unwrap();
         let ystart  = data_start + u64::from(yoff);
@@ -791,6 +793,12 @@ impl NADecoder for Indeo3Decoder {
     }
 }
 
+impl NAOptionHandler for Indeo3Decoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
 pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(Indeo3Decoder::new())
 }
@@ -799,17 +807,29 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::indeo_register_all_codecs;
-    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::indeo_register_all_decoders;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_indeo3() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        indeo_register_all_codecs(&mut dec_reg);
-
-        test_file_decoding("avi", "assets/Indeo/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg);
+        indeo_register_all_decoders(&mut dec_reg);
+
+        test_decoding("avi", "indeo3", "assets/Indeo/iv32_example.avi", Some(10),
+                      &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x90be698e, 0x326db071, 0x08e8c6a5, 0x39349acc],
+                            [0x25d677fc, 0x63f96aaa, 0xd412ca98, 0x61416313],
+                            [0xc4368250, 0x63e7b6bc, 0xffcff950, 0x11f13239],
+                            [0x7e869758, 0x027abc2e, 0x25204bca, 0x93fbaa03],
+                            [0x5a1e822c, 0x2b1a4cd5, 0x72059843, 0xe5689ad1],
+                            [0x3a971cce, 0x5ec22135, 0x1a45f802, 0x0f5f9264],
+                            [0x0a65f782, 0xd8767cf3, 0x878b4b8d, 0xfc94c88b],
+                            [0x4ac70139, 0x3300eac1, 0xba84b068, 0x47f5ff29],
+                            [0x3e8c8ec4, 0x9421b38c, 0x580abbbd, 0x92792d19],
+                            [0x9096ee9b, 0x8dd9fb14, 0x981e31e3, 0x3ffd7d29],
+                            [0x22dc71ec, 0x3d8f6f7e, 0x1a198982, 0x41d17ecc]]));
     }
 }