X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo3.rs;h=9e0ee1155320149a5556de96c10f9918d9c27921;hp=1705a432605cdd0594eb125eb7e445c7840d25c2;hb=379524159c95f1c3639976ccf35f9d47cd9732ac;hpb=5a6dec5fd53a92cc8696655084f986a69dc6a230

diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs
index 1705a43..9e0ee11 100644
--- 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;
@@ -325,7 +325,7 @@ impl Indeo3Decoder {
         Ok((self.bbuf >> self.bpos) & 0x3)
     }
 
-    #[allow(clippy::cyclomatic_complexity)]
+    #[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;
@@ -635,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;
@@ -662,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;
@@ -808,14 +808,14 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::indeo_register_all_codecs;
+    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);
+        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![