From 8c53d39e7f0604127bfc96fa1182c8abe3847ac6 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 15 Dec 2012 09:46:02 -0800 Subject: lavc: introduce VideoDSPContext Move some functions from dsputil. The idea is that videodsp contains functions that are useful for a large and varied set of video decoders. Currently, it contains emulated_edge_mc() and prefetch(). Signed-off-by: Luca Barbato --- libavcodec/cavs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/cavs.c') diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index a68a62801b..cec1d23683 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -392,7 +392,7 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic, || full_my < 0-extra_height || full_mx + 16/*FIXME*/ > pic_width + extra_width || full_my + 16/*FIXME*/ > pic_height + extra_height){ - s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->l_stride, h->l_stride, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, 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= s->edge_emu_buffer + 2 + 2*h->l_stride; emu=1; @@ -401,14 +401,14 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic, qpix_op[luma_xy](dest_y, src_y, h->l_stride); //FIXME try variable height perhaps? if(emu){ - s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_cb, h->c_stride, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src_cb, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cb= s->edge_emu_buffer; } chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx&7, my&7); if(emu){ - s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_cr, h->c_stride, + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src_cr, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cr= s->edge_emu_buffer; } -- cgit v1.2.3