diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-09-20 08:01:19 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-09-28 20:28:08 -0400 |
| commit | face578d56c2d1375e40d5e2a28acc122132bc55 (patch) | |
| tree | 8a4fe63c8066b59ea41dd09285b4a82587a65030 /libavcodec/cavs.c | |
| parent | f574b4da567cc1c175ab5463fb5b3901cbaa5595 (diff) | |
| download | ffmpeg-face578d56c2d1375e40d5e2a28acc122132bc55.tar.gz | |
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.
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 12af0c9a41..28327d7189 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -405,7 +405,8 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, || full_my < 0-extra_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, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->l_stride, + src_y - 2 - 2*h->l_stride, h->l_stride, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height); src_y= h->edge_emu_buffer + 2 + 2*h->l_stride; emu=1; @@ -414,14 +415,14 @@ static inline void mc_dir_part(AVSContext *h, AVFrame *pic, qpix_op[luma_xy](dest_y, src_y, h->l_stride); //FIXME try variable height perhaps? if(emu){ - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cb, h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cb, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cb= h->edge_emu_buffer; } chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx&7, my&7); if(emu){ - h->vdsp.emulated_edge_mc(h->edge_emu_buffer, src_cr, h->c_stride, + h->vdsp.emulated_edge_mc(h->edge_emu_buffer, h->c_stride, src_cr, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cr= h->edge_emu_buffer; } |