rad: fix some clippy warnings

diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs
index eb3158b1a8261d5376b2aae11ce8bde5c5f930dc..8c094789b460b3549c041883b6f68ccb71173712 100644 (file)
--- a/nihav-rad/src/codecs/bink2.rs
+++ b/nihav-rad/src/codecs/bink2.rs
@@ -1713,11 +1713,11 @@ fn decode_cbp_luma_old(br: &mut BitReader, prev_cbp: u32) -> DecoderResult<u32>
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
-        new_cbp = new_cbp | (nib1 << 4);
+        new_cbp |= nib1 << 4;
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
-        new_cbp = new_cbp | (nib1 << 8);
+        new_cbp |= nib1 << 8;
         if !br.read_bool()? {
             nib1                                = br.read(4)?;
         }
@@ -1926,9 +1926,7 @@ impl NADecoder for Bink2Decoder {
         let mut buf;
         self.key_frame = pkt.is_keyframe();
 
-        let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5);
-        if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-        let bufinfo = bufret.unwrap();
+        let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 5)?;
         buf = bufinfo.get_vbuf().unwrap();
 
         self.decode_frame_new(&mut br, &mut buf, pkt.is_keyframe())?;

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index daae9dffca695ffd8d3a17ef1ad4de8f62f3210d..b0c4fc2305101b07702dc27898820cf065e6dfee 100644 (file)
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -71,7 +71,7 @@ impl BinkAudioDecoder {
             transform:  Transform::None,
             version_b:  false,
             len:        0,
-            quants:     quants,
+            quants,
             bands:      [MAX_BANDS + 1; 26],
             num_bands:  0,
             duration:   0,

diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs
index 0a818cb377aae0c15b4996293bb5fa9f770a3097..69e30fe2a65d9abbb9664a91aa822648e03901cc 100644 (file)
--- a/nihav-rad/src/codecs/binkvid.rs
+++ b/nihav-rad/src/codecs/binkvid.rs
@@ -30,7 +30,7 @@ impl Tree {
             if br.read_bool()? {
                 let len                         = br.read(3)? as usize;
                 let mut present: [bool; 16] = [false; 16];
-                for i in 0..len+1 {
+                for i in 0..=len {
                     self.syms[i]                = br.read(4)? as u8;
                     present[self.syms[i] as usize] = true;
                 }
@@ -44,7 +44,7 @@ impl Tree {
                 let len                         = br.read(2)? as usize;
                 let mut syms: [u8; 16] = [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
                 let mut tmp: [u8; 16] = [0; 16];
-                for bits in 0..len+1 {
+                for bits in 0..=len {
                     let size = 1 << bits;
                     for arr in syms.chunks_mut(size * 2) {
                         let mut ptr0 = 0;
@@ -1053,7 +1053,7 @@ fn read_dct_coefficients(br: &mut BitReader, block: &mut [i32; 64], scan: &[usiz
     let q_index = if let Some(qidx) = q { qidx } else { br.read(4)? as usize };
     let qmat = &quant_matrices[q_index];
     block[0] = block[0].wrapping_mul(qmat[0]) >> 11;
-    for idx in coef_idx.into_iter().take(coef_count) {
+    for idx in coef_idx.iter().take(coef_count) {
         block[scan[*idx]] = block[scan[*idx]].wrapping_mul(qmat[*idx]) >> 11;
     }
 
@@ -1218,18 +1218,14 @@ impl NADecoder for BinkDecoder {
             if let Some(bbuf) = bufret {
                 buf = bbuf;
             } else {
-                let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4);
-                if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-                let bufinfo = bufret.unwrap();
+                let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4)?;
                 buf = bufinfo.get_vbuf().unwrap();
                 self.key_frame = true;
                 self.hams.add_frame(buf);
                 buf = self.hams.get_output_frame().unwrap();
             }
         } else {
-            let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4);
-            if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-            let bufinfo = bufret.unwrap();
+            let bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 4)?;
             buf = bufinfo.get_vbuf().unwrap();
         }
 

diff --git a/nihav-rad/src/codecs/mod.rs b/nihav-rad/src/codecs/mod.rs
index 4ce556391b12e84b67e00df80cdee7da112a0f61..eec8c4c4084e21d48a3b2b636f22695fd52ef3c8 100644 (file)
--- a/nihav-rad/src/codecs/mod.rs
+++ b/nihav-rad/src/codecs/mod.rs
@@ -29,7 +29,7 @@ const RAD_CODECS: &[DecoderInfo] = &[
 ];
 
 pub fn rad_register_all_codecs(rd: &mut RegisteredDecoders) {
-    for decoder in RAD_CODECS.into_iter() {
+    for decoder in RAD_CODECS.iter() {
         rd.add_decoder(decoder.clone());
     }
 }

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index 6eefdce43b3014705d6d0590b766436597604664..99d40d68b4bd5dc9fac5936bf5e4b121ca740616 100644 (file)
--- a/nihav-rad/src/codecs/smacker.rs
+++ b/nihav-rad/src/codecs/smacker.rs
@@ -444,9 +444,7 @@ impl NADecoder for SmackerVideoDecoder {
         if src.len() > PAL_SIZE {
             let mut br = BitReader::new(&src[PAL_SIZE..], src.len() - PAL_SIZE, BitReaderMode::LE);
 
-            let bufret = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2);
-            if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-            bufinfo = bufret.unwrap();
+            bufinfo = alloc_video_buffer(self.info.get_properties().get_video_info().unwrap(), 2)?;
             let mut buf = bufinfo.get_vbuf().unwrap();
             is_intra = self.decode_frame(&mut br)?;
             self.output_frame(&mut buf);

diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs
index 8dfbf64056157c67fa46248dd607bf0f21191d82..29427af1bab54b6df777cca6b2c9e1801cb58641 100644 (file)
--- a/nihav-rad/src/demuxers/bink.rs
+++ b/nihav-rad/src/demuxers/bink.rs
@@ -68,8 +68,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
         validate!((self.frames > 0) && (tb_num > 0) && (tb_den > 0) && (max_size < fsize));
         let mut flags: [u8; 4] = [0; 4];
                                               src.read_buf(&mut flags)?;
-        let mut edata: Vec<u8> = Vec::with_capacity(8);
-        edata.resize(8, 0);
+        let mut edata: Vec<u8> = vec![0; 8];
         let p0 = &mut edata[0..4];
         p0.copy_from_slice(&magic);
         let p1 = &mut edata[4..][..4];
@@ -99,7 +98,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
         }
 
         self.frame_pos = Vec::with_capacity(self.frames + 1);
-        for _ in 0..self.frames+1 {
+        for _ in 0..=self.frames {
             let pos                         = src.read_u32le()?;
             self.frame_pos.push(pos);
         }

diff --git a/nihav-rad/src/demuxers/mod.rs b/nihav-rad/src/demuxers/mod.rs
index a1234bd7c6ee78c6d8d2195bd0cf05156d58efeb..c88fdd69ad723c91c06161954a94a178e239fdfa 100644 (file)
--- a/nihav-rad/src/demuxers/mod.rs
+++ b/nihav-rad/src/demuxers/mod.rs
@@ -10,7 +10,7 @@ mod smacker;
 #[cfg(feature="demuxer_bink")]
 mod bink;
 
-const RAD_DEMUXERS: &[&'static DemuxerCreator] = &[
+const RAD_DEMUXERS: &[&DemuxerCreator] = &[
 #[cfg(feature="demuxer_smk")]
     &smacker::SMKDemuxerCreator {},
 #[cfg(feature="demuxer_bink")]
@@ -18,7 +18,7 @@ const RAD_DEMUXERS: &[&'static DemuxerCreator] = &[
 ];
 
 pub fn rad_register_all_demuxers(rd: &mut RegisteredDemuxers) {
-    for demuxer in RAD_DEMUXERS.into_iter() {
+    for demuxer in RAD_DEMUXERS.iter() {
         rd.add_demuxer(*demuxer);
     }
 }

diff --git a/nihav-rad/src/demuxers/smacker.rs b/nihav-rad/src/demuxers/smacker.rs
index 6555319c76ca1a3f55e1108099f28dc6f82e92b0..3e612efca146fab51264130ec9ba7712b91f21b9 100644 (file)
--- a/nihav-rad/src/demuxers/smacker.rs
+++ b/nihav-rad/src/demuxers/smacker.rs
@@ -178,7 +178,7 @@ impl<'a> DemuxCore<'a> for SmackerVideoDemuxer<'a> {
             validate!(chunk_size > 0);
             validate!(payload_size >= chunk_size);
             payload_size -= chunk_size;
-            let oldpal = self.pal.clone();
+            let oldpal = self.pal;
             let mut idx = 0;
             let endpos = self.src.tell() + (chunk_size as u64) - 1;
             while idx < 256 {

diff --git a/nihav-rad/src/lib.rs b/nihav-rad/src/lib.rs
index f723e9ef1aca9a4aa0c32f9488b62770ce504cff..1b566da815a3b83eb1a9981ea50ad9ea106b170f 100644 (file)
--- a/nihav-rad/src/lib.rs
+++ b/nihav-rad/src/lib.rs
@@ -1,6 +1,15 @@
 extern crate nihav_core;
 
 #[cfg(feature="decoders")]
+#[allow(clippy::cast_lossless)]
+#[allow(clippy::collapsible_if)]
+#[allow(clippy::excessive_precision)]
+#[allow(clippy::identity_op)]
+#[allow(clippy::needless_range_loop)]
+#[allow(clippy::too_many_arguments)]
+#[allow(clippy::unreadable_literal)]
+#[allow(clippy::useless_let_if_seq)]
 pub mod codecs;
 #[cfg(feature="demuxers")]
+#[allow(clippy::cast_lossless)]
 pub mod demuxers;
\ No newline at end of file