From 58e65e44f435243dc72dfce1f8af8afcf1319f34 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 24 Jul 2014 16:22:44 -0700 Subject: [PATCH] vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c This avoids invoking the wrapped functions with too many arguments. --- libavcodec/vc1dsp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 5adcb62635..3b92eb2ea5 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -682,6 +682,19 @@ PUT_VC1_MSPEL(1, 3) PUT_VC1_MSPEL(2, 3) PUT_VC1_MSPEL(3, 3) + +static void put_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, + ptrdiff_t stride, int rnd) +{ + ff_put_pixels8x8_c(dst, src, stride); +} + +static void avg_vc1_mspel_mc00_c(uint8_t *dst, const uint8_t *src, + ptrdiff_t stride, int rnd) +{ + ff_avg_pixels8x8_c(dst, src, stride); +} + #define chroma_mc(a) \ ((A * src[a] + B * src[a + 1] + \ C * src[stride + a] + D * src[stride + a + 1] + 32 - 4) >> 6) @@ -888,7 +901,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp) dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_c; dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_c; - dsp->put_vc1_mspel_pixels_tab[0] = ff_put_pixels8x8_c; + dsp->put_vc1_mspel_pixels_tab[0] = put_vc1_mspel_mc00_c; dsp->put_vc1_mspel_pixels_tab[1] = put_vc1_mspel_mc10_c; dsp->put_vc1_mspel_pixels_tab[2] = put_vc1_mspel_mc20_c; dsp->put_vc1_mspel_pixels_tab[3] = put_vc1_mspel_mc30_c; @@ -905,7 +918,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp) dsp->put_vc1_mspel_pixels_tab[14] = put_vc1_mspel_mc23_c; dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_c; - dsp->avg_vc1_mspel_pixels_tab[0] = ff_avg_pixels8x8_c; + dsp->avg_vc1_mspel_pixels_tab[0] = avg_vc1_mspel_mc00_c; dsp->avg_vc1_mspel_pixels_tab[1] = avg_vc1_mspel_mc10_c; dsp->avg_vc1_mspel_pixels_tab[2] = avg_vc1_mspel_mc20_c; dsp->avg_vc1_mspel_pixels_tab[3] = avg_vc1_mspel_mc30_c;