let src_x = sx - (pre as isize);
let src_y = sy - (pre as isize);
{
- let mut tmp_buf = NASimpleVideoFrame::from_video_buf(&mut mc_buf).unwrap();
- copy_block(&mut tmp_buf, src, comp, 0, 0, src_x as i16, src_y as i16,
- bsize, bsize, 0, 0, 0, interp);
- if (sy & 7) != 0 {
- let foff = (8 - (sy & 7)) as usize;
- let off = (pre + foff) * tmp_buf.stride[comp];
- vp31_loop_filter(tmp_buf.data, off, tmp_buf.stride[comp], 1, bsize, loop_str);
- }
+ let tmp_buf = NASimpleVideoFrame::from_video_buf(&mut mc_buf).unwrap();
+ edge_emu(src.as_ref(), src_x, src_y, bsize, bsize, &mut tmp_buf.data[tmp_buf.offset[comp]..], tmp_buf.stride[comp], comp);
+// copy_block(&mut tmp_buf, src, comp, 0, 0, src_x as i16, src_y as i16,
+// bsize, bsize, 0, 0, 0, interp);
if (sx & 7) != 0 {
let foff = (8 - (sx & 7)) as usize;
- let off = pre + foff;
+ let off = pre + foff + tmp_buf.offset[comp];
vp31_loop_filter(tmp_buf.data, off, 1, tmp_buf.stride[comp], bsize, loop_str);
}
+ if (sy & 7) != 0 {
+ let foff = (8 - (sy & 7)) as usize;
+ let off = (pre + foff) * tmp_buf.stride[comp] + tmp_buf.offset[comp];
+ vp31_loop_filter(tmp_buf.data, off, tmp_buf.stride[comp], 1, bsize, loop_str);
+ }
}
let dxoff = (pre as i16) - (dx as i16);
let dyoff = (pre as i16) - (dy as i16);
- copy_block(dst, mc_buf, comp, dx, dy, dxoff, dyoff, 8, 8, preborder, postborder, 0/* mode*/, interp);
+ copy_block(dst, mc_buf, comp, dx, dy, dxoff, dyoff, 8, 8, preborder, postborder, mode, interp);
}
fn vp3_interp00(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize)