From 458446acfa1441d283dacf9e6e545beb083b8bb0 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 14 Oct 2013 03:13:10 +0200 Subject: lavc: Edge emulation with dst/src linesize Allow supporting files for which the image stride is smaller than the maximum block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge. --- libavcodec/cavs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/cavs.c') diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 19b9929432..5a81089931 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -408,7 +408,8 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, full_mx + 16 /* FIXME */ > pic_width + extra_width || full_my + 16 /* FIXME */ > pic_height + extra_height) { h->vdsp.emulated_edge_mc(h->edge_emu_buffer, - src_y - 2 - 2 * h->l_stride, h->l_stride, + src_y - 2 - 2 * h->l_stride, + h->l_stride, h->l_stride, 16 + 5, 16 + 5 /* FIXME */, full_mx - 2, full_my - 2, pic_width, pic_height); @@ -421,7 +422,7 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, if (emu) { h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, - h->c_stride, + h->c_stride, h->c_stride, 9, 9 /* FIXME */, mx >> 3, my >> 3, pic_width >> 1, pic_height >> 1); @@ -431,7 +432,7 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, int chroma_height, if (emu) { h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr, - h->c_stride, + h->c_stride, h->c_stride, 9, 9 /* FIXME */, mx >> 3, my >> 3, pic_width >> 1, pic_height >> 1); -- cgit v1.2.3