rad: fix or silence clippy warnings

diff --git a/nihav-rad/src/codecs/bink2.rs b/nihav-rad/src/codecs/bink2.rs
index 1305878bed5b36a5c2590bc2e586d4667f7fcf26..2b6ca26a6bd12e1ec9886b79b2a489892aca783b 100644 (file)
--- a/nihav-rad/src/codecs/bink2.rs
+++ b/nihav-rad/src/codecs/bink2.rs
@@ -279,7 +279,7 @@ impl Bink2DSP {
             0 => {
                 let src = &ppix[poff..];
                 for (out, row) in dst.chunks_mut(stride).take(16).zip(src.chunks(pstride)) {
             0 => {
                 let src = &ppix[poff..];
                 for (out, row) in dst.chunks_mut(stride).take(16).zip(src.chunks(pstride)) {

-                    for i in 0..16 { out[i] = row[i]; }
+                    out[..16].copy_from_slice(&row[..16]);

                 }
             },
             1 => {
                 }
             },
             1 => {


@@ -338,7 +338,7 @@ impl Bink2DSP {
         if (mx == 0) && (my == 0) {
             let inpix = &ppix[poff..];
             for (out, src) in dst.chunks_mut(stride).take(8).zip(inpix.chunks(pstride)) {
         if (mx == 0) && (my == 0) {
             let inpix = &ppix[poff..];
             for (out, src) in dst.chunks_mut(stride).take(8).zip(inpix.chunks(pstride)) {

-                for i in 0..8 { out[i] = src[i]; }
+                out[..8].copy_from_slice(&src[..8]);

             }
         } else if my == 0 {
             chroma_interp!(dst, stride, 8, u8, &ppix[poff..], pstride, 1, mx, 2);
             }
         } else if my == 0 {
             chroma_interp!(dst, stride, 8, u8, &ppix[poff..], pstride, 1, mx, 2);


@@ -1027,6 +1027,7 @@ impl Bink2Decoder {
         Self::default()
     }
 
         Self::default()
     }
 

+    #[allow(clippy::cyclomatic_complexity)]

     fn decode_frame_new(&mut self, br: &mut BitReader, buf: &mut NAVideoBuffer<u8>, is_intra: bool) -> DecoderResult<()> {
         let (stride_y, stride_u, stride_v, stride_a) = (buf.get_stride(0), buf.get_stride(1), buf.get_stride(2), buf.get_stride(3));
         let (mut off_y, mut off_u, mut off_v, mut off_a) = (buf.get_offset(0), buf.get_offset(1), buf.get_offset(2), buf.get_offset(3));
     fn decode_frame_new(&mut self, br: &mut BitReader, buf: &mut NAVideoBuffer<u8>, is_intra: bool) -> DecoderResult<()> {
         let (stride_y, stride_u, stride_v, stride_a) = (buf.get_stride(0), buf.get_stride(1), buf.get_stride(2), buf.get_stride(3));
         let (mut off_y, mut off_u, mut off_v, mut off_a) = (buf.get_offset(0), buf.get_offset(1), buf.get_offset(2), buf.get_offset(3));

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index aee9bbc8058b48834c60591c46e035d94560c446..c94f39d2a33b2246faecf4858527dc3a077ef0e8 100644 (file)
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -130,6 +130,7 @@ impl BinkAudioDecoder {
         }
         Ok(())
     }
         }
         Ok(())
     }

+    #[allow(clippy::transmute_ptr_to_ptr)]

     fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) {
         match self.transform {
             Transform::DCT(ref mut dct) => {
     fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) {
         match self.transform {
             Transform::DCT(ref mut dct) => {

diff --git a/nihav-rad/src/codecs/smacker.rs b/nihav-rad/src/codecs/smacker.rs
index 8b24c6da714aa4b1c407fc1b35fee7110b74e797..14e51252f2135c4fdea1cddfa30baef2cdc26f07 100644 (file)
--- a/nihav-rad/src/codecs/smacker.rs
+++ b/nihav-rad/src/codecs/smacker.rs
@@ -367,7 +367,7 @@ impl SmackerVideoDecoder {
         let mut didx = 0;
         let mut sidx = 0;
         for _ in 0..self.h {
         let mut didx = 0;
         let mut sidx = 0;
         for _ in 0..self.h {

-            for x in 0..self.w { dst[didx + x] = self.frame[sidx + x]; }
+            dst[didx..][..self.w].copy_from_slice(&self.frame[sidx..][..self.w]);

             sidx += self.stride;
             didx += stride;
             if is_scaled {
             sidx += self.stride;
             didx += stride;
             if is_scaled {


@@ -510,6 +510,7 @@ impl NADecoder for SmackerAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
             Err(DecoderError::InvalidData)
         }
     }

+    #[allow(clippy::manual_memcpy)]

     fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let info = pkt.get_stream().get_info();
         if let NACodecTypeInfo::Audio(_) = info.get_properties() {
     fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let info = pkt.get_stream().get_info();
         if let NACodecTypeInfo::Audio(_) = info.get_properties() {

diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs
index 35bdcbf6126234a4030f432412403901e7c9f4e6..a5d8169240f9159f4bf8f0a244ca711eb50fe989 100644 (file)
--- a/nihav-rad/src/demuxers/bink.rs
+++ b/nihav-rad/src/demuxers/bink.rs
@@ -9,7 +9,7 @@ const BINK_AUD_FLAG_DCT:    u8 = 0x10;
 const BINK_AUD_FLAG_STEREO: u8 = 0x20;
 
 impl AudioTrack {
 const BINK_AUD_FLAG_STEREO: u8 = 0x20;
 
 impl AudioTrack {

-    fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: &[u8; 4]) -> DemuxerResult<Self> {
+    fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: [u8; 4]) -> DemuxerResult<Self> {

         let channels = if (flags & BINK_AUD_FLAG_STEREO) != 0 { 2 } else { 1 };
         let codecname = if (flags & BINK_AUD_FLAG_DCT) != 0 {
                 "bink-audio-dct"
         let channels = if (flags & BINK_AUD_FLAG_STEREO) != 0 { 2 } else { 1 };
         let codecname = if (flags & BINK_AUD_FLAG_DCT) != 0 {
                 "bink-audio-dct"


@@ -18,7 +18,7 @@ impl AudioTrack {
             };
         let ahdr = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 1);
         let mut edata: Vec<u8> = Vec::with_capacity(4);
             };
         let ahdr = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 1);
         let mut edata: Vec<u8> = Vec::with_capacity(4);

-        edata.extend_from_slice(magic);
+        edata.extend_from_slice(&magic);

         let ainfo = NACodecInfo::new(codecname, NACodecTypeInfo::Audio(ahdr), Some(edata));
         let res = strmgr.add_stream(NAStream::new(StreamType::Audio, (str_id + 1) as u32, ainfo, 1, srate));
         validate!(res.is_some());
         let ainfo = NACodecInfo::new(codecname, NACodecTypeInfo::Audio(ahdr), Some(edata));
         let res = strmgr.add_stream(NAStream::new(StreamType::Audio, (str_id + 1) as u32, ainfo, 1, srate));
         validate!(res.is_some());


@@ -93,7 +93,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
             let srate                       = src.read_u24le()?;
             let flags                       = src.read_byte()?;
             validate!(srate > 0);
             let srate                       = src.read_u24le()?;
             let flags                       = src.read_byte()?;
             validate!(srate > 0);

-            self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, &magic)?);
+            self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, magic)?);

         }
         for _ in 0..num_audio {
             let _trk_id                     = src.read_u32le()?;
         }
         for _ in 0..num_audio {
             let _trk_id                     = src.read_u32le()?;

diff --git a/nihav-rad/src/demuxers/smacker.rs b/nihav-rad/src/demuxers/smacker.rs
index 41cad05e853d5bd3527b3d8da737bff660fb40bc..accbfa51b956ca1a2bcc8c926209111c40bbcd59 100644 (file)
--- a/nihav-rad/src/demuxers/smacker.rs
+++ b/nihav-rad/src/demuxers/smacker.rs
@@ -95,6 +95,7 @@ fn get_pts_inc(val: i32) -> u64 {
 }
 
 impl<'a> DemuxCore<'a> for SmackerVideoDemuxer<'a> {
 }
 
 impl<'a> DemuxCore<'a> for SmackerVideoDemuxer<'a> {

+    #[allow(clippy::unreadable_literal)]

     fn open(&mut self, strmgr: &mut StreamManager, _seek_idx: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
         let mut magic: [u8; 4] = [0; 4];
     fn open(&mut self, strmgr: &mut StreamManager, _seek_idx: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
         let mut magic: [u8; 4] = [0; 4];


@@ -164,6 +165,8 @@ impl<'a> DemuxCore<'a> for SmackerVideoDemuxer<'a> {
 
         Ok(())
     }
 
         Ok(())
     }

+    #[allow(clippy::identity_op)]
+    #[allow(clippy::unreadable_literal)]

     fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
         if !self.queued_packets.is_empty() {
             let pkt = self.queued_packets.pop().unwrap();
     fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
         if !self.queued_packets.is_empty() {
             let pkt = self.queued_packets.pop().unwrap();