X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=03f97c9fec50720f5e19686ca033c6ac9a54640e;hb=40e57a5124ed76ee0d4b1a45f99b78d8191e93d3;hp=eace89e0c2383ebb7a77e89bddaa15482e0fb600;hpb=138b7d0a1f3baeac9427f194fd9a3f83abb22651;p=nihav.git

diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs
index eace89e..03f97c9 100644
--- a/nihav-duck/src/codecs/vp3.rs
+++ b/nihav-duck/src/codecs/vp3.rs
@@ -312,6 +312,7 @@ struct VP34Decoder {
     mb_h:       usize,
     version:    u8,
     is_intra:   bool,
+    update_gf:  bool,
     quant:      usize,
     shuf:       VPShuffler,
     codes:      Codes,
@@ -425,6 +426,14 @@ fn rescale_qmat(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16,
     dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval * 2) << 2;
 }
 
+fn rescale_qmat_vp4(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16, ac_quant: i16, is_intra: bool) {
+    let (bias, minval) = if is_intra { (3, 4) } else { (6, 8) };
+    for (dst, src) in dst_qmat.iter_mut().zip(base_qmat.iter()) {
+        *dst = ((src - bias).wrapping_mul(ac_quant) / 100 + bias) << 2;
+    }
+    dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval) << 2;
+}
+
 fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token: u8) -> DecoderResult<()> {
     match token {
         // EOBs
@@ -573,6 +582,7 @@ impl VP34Decoder {
             mb_h:       0,
             version,
             is_intra:   true,
+            update_gf:  false,
             quant:      0,
             shuf:       VPShuffler::new(),
             codes:      Codes::None,
@@ -1121,7 +1131,7 @@ impl VP34Decoder {
                     last2_mv = last_mv;
                     let saddr = (self.blk_addr[cur_blk] >> 2).min(self.blk_addr[cur_blk + 1] >> 2).min(self.blk_addr[cur_blk + 2] >> 2).min(self.blk_addr[cur_blk + 3] >> 2);
                     for i in 0..4 {
-                        let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w];
+                        let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w * 2];
                         blk.mv.x = br.read_cb(x_cb)? as i16;
                         if x_sign {
                             blk.mv.x = -blk.mv.x;
@@ -1182,7 +1192,7 @@ impl VP34Decoder {
     fn vp40_unpack_coeffs(&mut self, br: &mut BitReader, dc_table_y: usize, dc_table_c: usize, ac_table_y: usize, ac_table_c: usize) -> DecoderResult<()> {
         const VP40_PRED_MASKS: [usize; 16] = [ // top, bottom, left, right
                 0b1010, 0b1010, 0b1000, 0b1011,
-                0b1010, 0b1010, 0b0010, 0b1111,
+                0b1010, 0b1010, 0b0010, 0b1110,
                 0b0010, 0b1010, 0b0010, 0b0110,
                 0b0100, 0b0111, 0b1110, 0b1110
             ];
@@ -1266,6 +1276,9 @@ impl VP34Decoder {
         }
         let dc_quant = VP30_DC_SCALES[self.quant] * 10;
         let ac_quant = VP30_AC_SCALES[self.quant];
+
+        self.update_gf = ac_quant <= 50;
+
         rescale_qmat(&mut self.qmat_y, VP3_QMAT_Y, dc_quant, ac_quant, 2);
         rescale_qmat(&mut self.qmat_c, VP3_QMAT_C, dc_quant, ac_quant, 2);
         rescale_qmat(&mut self.qmat_y_p, VP3_QMAT_INTER, dc_quant, ac_quant, 4);
@@ -1395,10 +1408,10 @@ impl VP34Decoder {
         let dc_y_quant = VP40_DC_Y_SCALES[self.quant];
         let dc_c_quant = VP40_DC_C_SCALES[self.quant];
         let ac_quant = VP40_AC_SCALES[self.quant];
-        rescale_qmat(&mut self.qmat_y, VP40_QMAT, dc_y_quant, ac_quant, 2);
-        rescale_qmat(&mut self.qmat_c, VP40_QMAT, dc_c_quant, ac_quant, 2);
-        self.qmat_y_p.copy_from_slice(&self.qmat_y);
-        self.qmat_c_p.copy_from_slice(&self.qmat_c);
+        rescale_qmat_vp4(&mut self.qmat_y,   VP40_QMAT, dc_y_quant, ac_quant, true);
+        rescale_qmat_vp4(&mut self.qmat_y_p, VP40_QMAT, dc_c_quant, ac_quant, false);
+        self.qmat_c.copy_from_slice(&self.qmat_y);
+        self.qmat_c_p.copy_from_slice(&self.qmat_y_p);
 
         self.eob_run = 0;
         let dc_table_y                          = br.read(4)? as usize;
@@ -1835,7 +1848,7 @@ impl NADecoder for VP34Decoder {
              _ => return Err(DecoderError::Bug),
         }
 
-        if self.is_intra {
+        if self.is_intra || self.update_gf {
             self.shuf.add_golden_frame(buf.clone());
         }
         self.shuf.add_frame(buf.clone());
@@ -1873,8 +1886,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        let file = "assets/Duck/vp30-logo.avi";
-        test_file_decoding("avi", file, Some(23), true, false, None/*Some("vp30")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f]));
     }
 
     #[test]