diff options
Diffstat (limited to 'libavcodec/x86/diracdsp_mmx.c')
-rw-r--r-- | libavcodec/x86/diracdsp_mmx.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_mmx.c index 9a2e858c90..0756f9f80e 100644 --- a/libavcodec/x86/diracdsp_mmx.c +++ b/libavcodec/x86/diracdsp_mmx.c @@ -26,39 +26,39 @@ void ff_put_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, void ff_put_signed_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height); void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height); -#define HPEL_FILTER(MMSIZE, EXT) \ -void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, uint8_t *, int, int);\ -void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, uint8_t *, int);\ -\ -static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc,\ - uint8_t *src, int stride, int width, int height)\ -{\ - while( height-- )\ - {\ - ff_dirac_hpel_filter_v_ ## EXT(dstv-MMSIZE, src-MMSIZE, stride, width+MMSIZE+5);\ - ff_dirac_hpel_filter_h_ ## EXT(dsth, src, width);\ - ff_dirac_hpel_filter_h_ ## EXT(dstc, dstv, width);\ -\ - dsth += stride;\ - dstv += stride;\ - dstc += stride;\ - src += stride;\ - }\ -} +#define HPEL_FILTER(MMSIZE, EXT) \ + void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, uint8_t *, int, int); \ + void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, uint8_t *, int); \ + \ + static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \ + uint8_t *src, int stride, int width, int height) \ + { \ + while( height-- ) \ + { \ + ff_dirac_hpel_filter_v_ ## EXT(dstv-MMSIZE, src-MMSIZE, stride, width+MMSIZE+5); \ + ff_dirac_hpel_filter_h_ ## EXT(dsth, src, width); \ + ff_dirac_hpel_filter_h_ ## EXT(dstc, dstv, width); \ + \ + dsth += stride; \ + dstv += stride; \ + dstc += stride; \ + src += stride; \ + } \ + } #if !ARCH_X86_64 HPEL_FILTER(8, mmx) #endif HPEL_FILTER(16, sse2) -#define PIXFUNC(PFX, IDX, EXT) \ - c->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT; \ +#define PIXFUNC(PFX, IDX, EXT) \ + c->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT; \ c->PFX ## _dirac_pixels_tab[1][IDX] = ff_ ## PFX ## _dirac_pixels16_ ## EXT; \ c->PFX ## _dirac_pixels_tab[2][IDX] = ff_ ## PFX ## _dirac_pixels32_ ## EXT void ff_diracdsp_init_mmx(DiracDSPContext* c) { - int mm_flags = av_get_cpu_flags();; + int mm_flags = av_get_cpu_flags();; #if HAVE_YASM c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx; |