Rewrite emu_edge functions to have separate src/dst_stride arguments.

This allows supporting files for which the image stride is smaller than
the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file
or a 16x16 VP8 file with -fflags +emu_edge.
This commit is contained in:
Ronald S. Bultje
2013-09-20 08:01:19 -04:00
parent f574b4da56
commit face578d56
20 changed files with 666 additions and 683 deletions

View File

@@ -405,8 +405,9 @@ void ff_draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
}
}
typedef void emulated_edge_mc_func(uint8_t *dst, const uint8_t *src,
ptrdiff_t linesize, int block_w, int block_h,
typedef void emulated_edge_mc_func(uint8_t *dst, ptrdiff_t dst_stride,
const uint8_t *src, ptrdiff_t src_linesize,
int block_w, int block_h,
int src_x, int src_y, int w, int h);
static av_always_inline void gmc(uint8_t *dst, uint8_t *src,
@@ -454,7 +455,7 @@ static av_always_inline void gmc(uint8_t *dst, uint8_t *src,
src += ix + iy * stride;
if (need_emu) {
emu_edge_fn(edge_buf, src, stride, w + 1, h + 1, ix, iy, width, height);
emu_edge_fn(edge_buf, stride, src, stride, w + 1, h + 1, ix, iy, width, height);
src = edge_buf;
}