vp31_loop_filter(frm.data, off, frm.stride[plane], 1, 8, loop_str);
}
+fn vp3_mv_mode(mvx: i16, mvy: i16) -> usize {
+ let mode = ((mvx & 1) + (mvy & 1) * 2) as usize;
+ if (mode == 3) && (mvx ^ mvy < 0) {
+ 4
+ } else {
+ mode
+ }
+}
+
impl VP34Decoder {
fn new(version: u8) -> Self {
let vt = alloc_video_buffer(NAVideoInfo::new(24, 24, false, YUV420_FORMAT), 4).unwrap();
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;
}
} 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)?;
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)?;
} 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<()> {
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 {
if self.blocks[blk_idx + bx].btype != VPMBType::InterFourMV {
continue;
}
- let mv_a = self.blocks[blk_idx + bx].mv;
- let mv_b = self.blocks[blk_idx + bx + 1].mv;
- let mv_c = self.blocks[blk_idx + bx + bstride].mv;
- let mv_d = self.blocks[blk_idx + bx + 1 + bstride].mv;
- let mut mv_sum = mv_a + mv_b + mv_c + mv_d;
+ let mvs = [ self.blocks[blk_idx + bx].mv,
+ self.blocks[blk_idx + bx + 1].mv,
+ self.blocks[blk_idx + bx + bstride].mv,
+ self.blocks[blk_idx + bx + 1 + bstride].mv ];
+ let mut mv_sum = mvs[0] + mvs[1] + mvs[2] + mvs[3];
mv_sum.x = (mv_sum.x + 2) >> 2;
mv_sum.y = (mv_sum.y + 2) >> 2;
let src = self.shuf.get_last().unwrap();
- let mode = ((mv_a.x & 1) + (mv_a.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8, by * 8,
- mv_a.x >> 1, mv_a.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8, by * 8,
- mv_a.x >> 1, mv_a.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_b.x & 1) + (mv_b.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8,
- mv_b.x >> 1, mv_b.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8,
- mv_b.x >> 1, mv_b.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_c.x & 1) + (mv_c.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8, by * 8 + 8,
- mv_c.x >> 1, mv_c.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8, by * 8 + 8,
- mv_c.x >> 1, mv_c.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_d.x & 1) + (mv_d.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8 + 8,
- mv_d.x >> 1, mv_d.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8 + 8,
- mv_d.x >> 1, mv_d.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
+ 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,
+ mvs[i].x >> 1, mvs[i].y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
+ } else {
+ vp_copy_block(frm, src.clone(), 0, bx * 8 + xoff, by * 8 + yoff,
+ mvs[i].x >> 1, mvs[i].y >> 1, 0, 1, self.loop_str,
+ mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
+ }
}
let mx = (mv_sum.x >> 1) | (mv_sum.x & 1);
let my = (mv_sum.y >> 1) | (mv_sum.y & 1);
- let mode = ((mx & 1) + (my & 1) * 2) as usize;
+ let mode = vp3_mv_mode(mx, my);
copy_block(frm, src.clone(), 1, bx * 4, by * 4, mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
copy_block(frm, src.clone(), 2, bx * 4, by * 4, mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
}
} else {
self.shuf.get_golden().unwrap()
};
- let mode = ((blk.mv.x & 1) + (blk.mv.y & 1) * 2) as usize;
+ let mode = vp3_mv_mode(blk.mv.x, blk.mv.y);
if self.version != 4 {
copy_block(frm, src.clone(), 0, bx * 8, by * 8,
blk.mv.x >> 1, blk.mv.y >> 1, 16, 16, 0, 1, mode, VP3_INTERP_FUNCS);
}
let mx = (blk.mv.x >> 1) | (blk.mv.x & 1);
let my = (blk.mv.y >> 1) | (blk.mv.y & 1);
- let mode = ((mx & 1) + (my & 1) * 2) as usize;
+ let mode = vp3_mv_mode(mx, my);
if self.version != 4 {
copy_block(frm, src.clone(), 1, bx * 4, by * 4,
mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
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 {
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 {
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]
projects / nihav.git / blobdiff