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 {
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,
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 {