rv6: handle DQP properly

[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 2dadc258b5f9a0369a37b5cafbb1b910e2282b2e..f8dbc53613918793a35c62ea18569abe36846065 100644 (file)
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -682,12 +682,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 +708,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)?;
@@ -899,7 +899,7 @@ println!(" left {} bits", br.left());
                                     let dst = &mut buf.data;
                                     self.populate_ipred(hdr, dst, 0, dstride, xoff, yoff, 4, true);
                                     let itype = self.blk_info[self.blk_pos + (i & 1) + (i >> 1) * self.blk_stride].imode;
-                                    self.ipred.pred_angle(dst, off, dstride, 4, itype as usize, false);
+                                    self.ipred.pred_angle(dst, off, dstride, 4, itype as usize, true);
                                 }
                                 if ((cbp8 >> i) & 1) != 0 {
                                     let blk = &mut self.y_coeffs[i * 16..][..16];
@@ -1594,17 +1594,42 @@ mod test {
         test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![
                             [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
-                            [0xc7d45c3b, 0x6a82ff3a, 0xaf49a7ea, 0x7cf9a533],
+                            [0x76743a3b, 0x7dd4f196, 0x0193fe5a, 0x4f78c7cb],
                             [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
-                            [0xec3cf068, 0xe989c7f5, 0x0bd41758, 0x81199c9e],
-                            [0x24134118, 0xeece4c59, 0x3f319c04, 0xd04951fd],
-                            [0x5a2e4e52, 0xa11ad66f, 0x304f2a84, 0xe43aaa90],
-                            [0x06d8bb44, 0x00b83933, 0xacce3d6f, 0x7159cd5e],
-                            [0xe5dfb853, 0x93f2fe74, 0x932d8c1a, 0x2579208e],
-                            [0xcfc5cae6, 0xa878bbd5, 0x5f0302c5, 0x9c0623ae],
-                            [0x5103a4ad, 0xec5ebe4e, 0x445037ca, 0x3797abe1],
-                            [0x66c9b636, 0xaec1afb7, 0x978fa6eb, 0x964649f5],
-                            [0xf1d17b76, 0xe8351888, 0x59d4acf1, 0x22387b9e],
-                            [0x8fff649f, 0xf1fe573b, 0xfce60560, 0x47c8c8b1]]));
+                            [0xfee70206, 0x626f3bea, 0x7677ad4b, 0x1228f3b6],
+                            [0x7156cbc2, 0xf381bcb6, 0xe86531f2, 0xb311c3ea],
+                            [0x1742b5a1, 0x66252580, 0x242753de, 0x5215d732],
+                            [0xd357ebda, 0x6460dba6, 0xa93eb616, 0x63ee6d60],
+                            [0x4cd72275, 0x28e1e439, 0xad17dfca, 0x3fd7253f],
+                            [0xe389ce4f, 0x8f0891b3, 0x88639b23, 0x21ed114f],
+                            [0x5b2b2f1b, 0x17a7518b, 0x53806e6a, 0x4538bb00],
+                            [0xdca03c9a, 0x1a45d80c, 0x86141211, 0x79912ed4],
+                            [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]]));
     }
 }