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

diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs
index e52c940..eace89e 100644
--- a/nihav-duck/src/codecs/vp3.rs
+++ b/nihav-duck/src/codecs/vp3.rs
@@ -611,7 +611,6 @@ impl VP34Decoder {
                 validate!(self.version == 3 || self.version == 30);
                 let mb_w                        = br.read(8)? as usize;
                 let mb_h                        = br.read(8)? as usize;
-println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
                 validate!(mb_w == self.mb_w && mb_h == self.mb_h);
                 if self.version == 3 {
                     self.version = 30;
@@ -619,7 +618,6 @@ println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
                 }
             } else {
                 let version                     = br.read(13)?;
-println!("intra, ver {} (self {})", version, self.version);
                 let coding_type                 = br.read(1)?;
                 validate!(coding_type == 0);
                                                   br.skip(2)?;
@@ -633,7 +631,6 @@ println!("intra, ver {} (self {})", version, self.version);
                     validate!(self.version == 4);
                     let mb_h                    = br.read(8)? as usize;
                     let mb_w                    = br.read(8)? as usize;
-//println!(" VP40 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
                     validate!(mb_w == self.mb_w && mb_h == self.mb_h);
                     let fact1                   = br.read(5)?;
                     let fact2                   = br.read(3)?;
@@ -652,7 +649,6 @@ println!("intra, ver {} (self {})", version, self.version);
             } else {
                 VP40_LOOP_STRENGTH[self.quant]
             };
-//println!("decode frame({},{},{})", self.is_intra as u8, self.is_intra as u8, self.quant);
         Ok(())
     }
     fn vp30_unpack_sb_info(&mut self, br: &mut BitReader) -> DecoderResult<()> {
@@ -960,15 +956,19 @@ println!("intra, ver {} (self {})", version, self.version);
         let mut cur_blk = 0;
         for _ in 0..self.y_blocks/4 {
             if self.blocks[self.blk_addr[cur_blk] >> 2].btype == VPMBType::InterFourMV {
-                for _ in 0..4 {
-                    let blk = &mut self.blocks[self.blk_addr[cur_blk] >> 2];
-                    if blk.coded {
-                        blk.mv = (read_mv)(br)?;
-                        last2_mv = last_mv;
-                        last_mv = blk.mv;
-                    }
-                    cur_blk += 1;
-                }
+                let a0 = self.blk_addr[cur_blk + 0] >> 2;
+                let a1 = self.blk_addr[cur_blk + 1] >> 2;
+                let a2 = self.blk_addr[cur_blk + 2] >> 2;
+                let a3 = self.blk_addr[cur_blk + 3] >> 2;
+                let first = a0.min(a1).min(a2).min(a3);
+                let last  = a0.max(a1).max(a2).max(a3);
+                self.blocks[first + 0].mv = (read_mv)(br)?;
+                self.blocks[first + 1].mv = (read_mv)(br)?;
+                self.blocks[last  - 1].mv = (read_mv)(br)?;
+                self.blocks[last  + 0].mv = (read_mv)(br)?;
+                last2_mv = last_mv;
+                last_mv = self.blocks[last].mv;
+                cur_blk += 4;
             } else {
                 let cur_mv;
                 match self.blocks[self.blk_addr[cur_blk] >> 2].btype {
@@ -1558,7 +1558,7 @@ println!("intra, ver {} (self {})", version, self.version);
                 for i in 0..4 {
                     let xoff = (i &  1) * 8;
                     let yoff = (i >> 1) * 8;
-                    
+
                     let mode = vp3_mv_mode(mvs[i].x, mvs[i].y);
                     if self.version != 4 {
                         copy_block(frm, src.clone(), 0, bx * 8 + xoff, by * 8 + yoff,
@@ -1630,15 +1630,15 @@ println!("intra, ver {} (self {})", version, self.version);
                 if blk.has_ac {
                     unquant(&mut blk.coeffs, qmat);
                 }
-                if blk.btype.is_intra() {
-                    if !blk.coded {
-                        copy_block(frm, self.shuf.get_last().unwrap(), 0, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
-                    } else if blk.has_ac {
+                if !blk.coded {
+                    copy_block(frm, self.shuf.get_last().unwrap(), 0, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
+                } else if blk.btype.is_intra() {
+                    if blk.has_ac {
                         vp_put_block(&mut blk.coeffs, bx, by, 0, frm);
                     } else {
                         vp_put_block_dc(&mut blk.coeffs, bx, by, 0, frm);
                     }
-                } else if blk.coded {
+                } else {
                     if blk.has_ac {
                         vp_add_block(&mut blk.coeffs, bx, by, 0, frm);
                     } else {
@@ -1656,15 +1656,15 @@ println!("intra, ver {} (self {})", version, self.version);
                     if blk.has_ac {
                         unquant(&mut blk.coeffs, qmat);
                     }
-                    if blk.btype.is_intra() {
-                        if !blk.coded {
-                            copy_block(frm, self.shuf.get_last().unwrap(), plane, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
-                        } else if blk.has_ac {
+                    if !blk.coded {
+                        copy_block(frm, self.shuf.get_last().unwrap(), plane, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
+                    } else if blk.btype.is_intra() {
+                        if blk.has_ac {
                             vp_put_block(&mut blk.coeffs, bx, by, plane, frm);
                         } else {
                             vp_put_block_dc(&mut blk.coeffs, bx, by, plane, frm);
                         }
-                    } else if blk.coded {
+                    } else {
                         if blk.has_ac {
                             vp_add_block(&mut blk.coeffs, bx, by, plane, frm);
                         } else {
@@ -1884,11 +1884,13 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        let file = "assets/Duck/vp31.avi";
+//        let file = "assets/Duck/vp31.avi";
 //        let file = "assets/Duck/vp31_crash.avi";
 //        let file = "assets/Duck/01-vp31-0500.avi";
-        test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
+//        test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
 //panic!("end");
+        test_decoding("avi", "vp3", "assets/Duck/01-vp31-0500.avi", Some(16), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x65112f7e, 0x2914f29b, 0x2908ed2f, 0xce5fc8c5]));
     }
 
     #[test]