X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv60.rs;h=c786b71a0495753f62e61de01433dba5b91b27ff;hp=ecc400a7c821128a599e864d90aa0ca3994cf8b8;hb=379524159c95f1c3639976ccf35f9d47cd9732ac;hpb=fa57381ec2a3b8c441aa1388492b9ca037cfcf78

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index ecc400a..c786b71 100644
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -123,7 +123,7 @@ impl FrameHeader {
             signs.push(sign);
         }
         validate!(signs[0]);
-        sizes.truncate(0);
+        sizes.clear();
         let mut sum = 0;
         let first_size                                  = br.read(nbits)? as usize;
         validate!(first_size > 0);
@@ -728,7 +728,7 @@ println!(" left {} bits", br.left());
 }
         Ok(())
     }
-    #[allow(clippy::cyclomatic_complexity)]
+    #[allow(clippy::cognitive_complexity)]
     fn decode_cb_tree(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, br: &mut BitReader, xpos: usize, ypos: usize, log_size: u8) -> DecoderResult<()> {
         if (xpos >= hdr.width) || (ypos >= hdr.height) { return Ok(()); }
 
@@ -1506,7 +1506,7 @@ println!("???");
         self.pu_stride = cu_w << 3;
         self.pu_info.resize(self.pu_stride * (cu_h << 3), PUInfo::default());
         self.blk_stride = cu_w << 4;
-        self.blk_info.truncate(0);
+        self.blk_info.clear();
         self.blk_info.resize(self.blk_stride * (cu_h << 4), BlockInfo::default());
         if hdr.deblock {
             self.dblk.reinit(hdr.width, hdr.height);
@@ -1589,14 +1589,14 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_rv60() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        realmedia_register_all_codecs(&mut dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
 
         test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![