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();
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 {