fix clippy warnings

[nihav.git] / nihav-realmedia / src / codecs / rv60.rs

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 254cc372dce744ad1d8b2626c1d64f555264841c..befe7a651cd4784e30242ca41054663406201f92 100644 (file)
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -233,22 +233,20 @@ const RV60_AVAIL_MASK: [u8; 64] = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 ];
 
-#[derive(Clone,Copy,PartialEq,Debug)]
+#[derive(Clone,Copy,PartialEq,Debug,Default)]
 enum CUType {
+    #[default]
     Intra,
     InterMV,
     Skip,
     InterNoMV,
 }
 
-impl Default for CUType {
-    fn default() -> Self { CUType::Intra }
-}
-
 const RV60_CU_TYPES: [CUType; 4] = [ CUType::Intra, CUType::InterMV, CUType::Skip, CUType::InterNoMV ];
 
-#[derive(Clone,Copy,PartialEq,Debug)]
+#[derive(Clone,Copy,PartialEq,Debug,Default)]
 enum PUType {
+    #[default]
     Full,
     N2Hor,
     N2Ver,
@@ -317,10 +315,6 @@ impl PUType {
     }
 }
 
-impl Default for PUType {
-    fn default() -> Self { PUType::Full }
-}
-
 #[derive(Clone,Copy,Debug)]
 enum IntraMode {
     Index(u8),
@@ -329,18 +323,15 @@ enum IntraMode {
     Plane64,
 }
 
-#[derive(Clone,Copy,PartialEq,Debug)]
+#[derive(Clone,Copy,PartialEq,Debug,Default)]
 enum TransformType {
+    #[default]
     None,
     T4X4,
     T8X8,
     T16X16,
 }
 
-impl Default for TransformType {
-    fn default() -> Self { TransformType::None }
-}
-
 #[derive(Clone,Copy,PartialEq,Debug)]
 enum MVRef {
     None,
@@ -595,11 +586,11 @@ impl DeblockInfo {
     fn get_left_strength(&self, pos: usize) -> u8 {
         self.left_str[pos] & 3
     }
-    fn set_top_strength(&mut self, pos: usize, str: u8) {
-        self.top_str[pos] |= str;
+    fn set_top_strength(&mut self, pos: usize, strength: u8) {
+        self.top_str[pos] |= strength;
     }
-    fn set_left_strength(&mut self, pos: usize, str: u8) {
-        self.left_str[pos] |= str;
+    fn set_left_strength(&mut self, pos: usize, strength: u8) {
+        self.left_str[pos] |= strength;
     }
 }
 
@@ -682,12 +673,13 @@ impl RealVideo60Decoder {
     fn decode_cu_line(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, src: &[u8], cu_y: usize) -> DecoderResult<()> {
         let mut br = BitReader::new(src, BitReaderMode::BE);
         let cu_w = hdr.get_width_cu();
-        let dqp = hdr.read_line_qp_offset(&mut br)?;
-        let qps = (hdr.qp as i8) + dqp;
-        validate!((0..32).contains(&qps));
-        let qp = qps as u8;
-        self.qp = qp;
-        self.sel_qp = match hdr.osvquant {
+        for cu_x in 0..cu_w {
+            let dqp = hdr.read_line_qp_offset(&mut br)?;
+            let qps = (hdr.qp as i8) + dqp;
+            validate!((0..32).contains(&qps));
+            let qp = qps as u8;
+            self.qp = qp;
+            self.sel_qp = match hdr.osvquant {
                 0 => qp,
                 1 => {
                         if qp <= 25 {
@@ -707,7 +699,6 @@ impl RealVideo60Decoder {
                     },
             };
 
-        for cu_x in 0..cu_w {
             self.cu_splits.clear();
             self.coded_blk = [false; 64];
             self.decode_cb_tree(buf, hdr, &mut br, cu_x << 6, cu_y << 6, 6)?;
@@ -1428,7 +1419,6 @@ impl NADecoder for RealVideo60Decoder {
 
             Ok(())
         } else {
-println!("???");
             Err(DecoderError::InvalidData)
         }
     }
@@ -1503,7 +1493,7 @@ println!("???");
         if hdr.deblock {
             self.dblk.reinit(hdr.awidth, hdr.aheight);
         }
-        let mut off = hsize + ((br.tell() >> 3) as usize);
+        let mut off = hsize + (br.tell() >> 3);
         let mut dframe = NASimpleVideoFrame::from_video_buf(&mut buf).unwrap();
         for (cu_y, size) in slices.into_iter().enumerate() {
             self.decode_cu_line(&mut dframe, &hdr, &src[off..][..size], cu_y)?;
@@ -1553,8 +1543,8 @@ impl NAOptionHandler for RealVideo60Decoder {
             for opt_def in DECODER_OPTIONS.iter() {
                 if opt_def.check(option).is_ok() {
                     match (option.name, &option.value) {
-                        (FRAME_SKIP_OPTION, NAValue::String(ref str)) => {
-                            if let Ok(smode) = FrameSkipMode::from_str(str) {
+                        (FRAME_SKIP_OPTION, NAValue::String(ref strval)) => {
+                            if let Ok(smode) = FrameSkipMode::from_str(strval) {
                                 self.skip_mode = smode;
                             }
                         },
@@ -1607,4 +1597,29 @@ mod test {
                             [0x0bf66bf4, 0x46385620, 0xc6fa4796, 0xd8e16d56],
                             [0x4671a7f0, 0x46f50649, 0x268df27b, 0x70b71ab3]]));
     }
+    #[test]
+    fn test_rv60_dqp() {
+        let mut dmx_reg = RegisteredDemuxers::new();
+        realmedia_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        realmedia_register_all_decoders(&mut dec_reg);
+
+        // sample provided by Peter Ross
+        test_decoding("realmedia", "realvideo6", "assets/RV/qp-offset-type-2.rmhd", Some(500), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5Frames(vec![
+                            [0x3dc2f19e, 0x0f8c66bd, 0x8e81ceda, 0xa1bf8f58],
+                            [0xbd9c0f89, 0x67b780b0, 0xa4afe443, 0x9f17221a],
+                            [0xf3e0a7ba, 0xe620ace9, 0x03857219, 0x8c3bd1fb],
+                            [0xc4eedc8c, 0x81d2dd0f, 0xa6443847, 0x09c8cec9],
+                            [0x565fc952, 0x4d5dc166, 0xf64b7b0d, 0x1570de50],
+                            [0x0e50786a, 0xaf058ff3, 0xa3f71eba, 0x370c197a],
+                            [0x1b92667b, 0x9cab9e24, 0x1bf48cb2, 0x368db124],
+                            [0xefcc0ab4, 0x6efceb20, 0xb2501ee8, 0xb449b7b6],
+                            [0xbbc2ca23, 0x6a7a8da2, 0xeadc1ff7, 0x2ff0a7f3],
+                            [0x6d14a2b4, 0x0d2642fb, 0x78fcad10, 0xba571ec1],
+                            [0xbdf889fd, 0x5f15838a, 0x8fedd13f, 0xc26a2e50],
+                            [0x886f03b6, 0xc46ba7c3, 0xae6aa971, 0x90cf94b6],
+                            [0x951693e7, 0xa77f68f3, 0x765990c9, 0x4a4d57fa],
+                            [0x3c25f4eb, 0x5c113c41, 0x4d73f498, 0xd7e210b0]]));
+    }
 }