fix clippy warnings

[nihav.git] / nihav-commonfmt / src / codecs / jpeg.rs

diff --git a/nihav-commonfmt/src/codecs/jpeg.rs b/nihav-commonfmt/src/codecs/jpeg.rs
index 099aff9633e21c4e5653e0b9f9d141a50a9f5e74..08f30a784be3d2a7460c5c42903b250ce46f6a27 100644 (file)
--- a/nihav-commonfmt/src/codecs/jpeg.rs
+++ b/nihav-commonfmt/src/codecs/jpeg.rs
@@ -63,6 +63,7 @@ fn idct_row(row: &mut [i16]) {
 }
 
 #[allow(clippy::erasing_op)]
+#[allow(clippy::identity_op)]
 fn idct_col(blk: &mut [i16; 64], off: usize) {
     let in0 = ((i32::from(blk[off + 0*8])) << 8) + (1 << (COL_SHIFT - 1));
     let in1 =  (i32::from(blk[off + 4*8])) << 8;
@@ -236,6 +237,7 @@ impl JPEGDecoder {
         self.depth      = 0;
     }
 
+    #[allow(clippy::many_single_char_names)]
     fn parse_sof(&mut self, br: &mut ByteReader) -> DecoderResult<NABufferType> {
         validate!(self.width == 0);
 
@@ -441,7 +443,7 @@ fn build_default_cb(dc: bool, idx: usize) -> DecoderResult<Codebook<u8>> {
     if dc {
         generate_cb(&DC_LENS[idx], &DC_SYMS)
     } else {
-        generate_cb(&AC_LENS[idx], &AC_SYMS[idx])
+        generate_cb(&AC_LENS[idx], AC_SYMS[idx])
     }
 }
 
@@ -635,9 +637,7 @@ impl NADecoder for JPEGDecoder {
                                 std::mem::swap(&mut self.buf, &mut data);
                                 let ret = self.decode_scan(&data, buf, &ci[..ns], ss, se);
                                 std::mem::swap(&mut self.buf, &mut data);
-                                if let Err(err) = ret {
-                                    return Err(err);
-                                }
+                                ret?;
                             } else { unreachable!(); }
                         },
                         JPEGType::Progressive => {
@@ -754,6 +754,7 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_decoders(&mut dec_reg);
+        // sample: self-created with avconv
         test_decoding("avi", "jpeg", "assets/Misc/mjpeg.avi", Some(1), &dmx_reg,
                      &dec_reg, ExpectedTestResult::MD5Frames(vec![
                             [0xe07f7128, 0x8c55eb5d, 0x03bfdee5, 0x358b24a4],