RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swscale: x86: Consistently use lowercase function name suffixes

This commit is contained in:
Diego Biurrun 2013-11-21 16:30:00 +01:00
parent 56c2337004
commit c16bfb147d
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libswscale/x86/rgb2rgb.c
View File

@ -92,21 +92,21 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
//MMX versions //MMX versions
#undef RENAME #undef RENAME
#define RENAME(a) a ## _MMX #define RENAME(a) a ## _mmx
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
// MMXEXT versions // MMXEXT versions
#undef RENAME #undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT #undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1 #define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _MMXEXT #define RENAME(a) a ## _mmxext
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
//SSE2 versions //SSE2 versions
#undef RENAME #undef RENAME
#undef COMPILE_TEMPLATE_SSE2 #undef COMPILE_TEMPLATE_SSE2
#define COMPILE_TEMPLATE_SSE2 1 #define COMPILE_TEMPLATE_SSE2 1
#define RENAME(a) a ## _SSE2 #define RENAME(a) a ## _sse2
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
//3DNOW versions //3DNOW versions
@ -117,7 +117,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL;
#define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_MMXEXT 0
#define COMPILE_TEMPLATE_SSE2 0 #define COMPILE_TEMPLATE_SSE2 0
#define COMPILE_TEMPLATE_AMD3DNOW 1 #define COMPILE_TEMPLATE_AMD3DNOW 1
#define RENAME(a) a ## _3DNOW #define RENAME(a) a ## _3dnow
#include "rgb2rgb_template.c" #include "rgb2rgb_template.c"
/* /*
@ -135,12 +135,12 @@ av_cold void rgb2rgb_init_x86(void)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (INLINE_MMX(cpu_flags)) if (INLINE_MMX(cpu_flags))
rgb2rgb_init_MMX(); rgb2rgb_init_mmx();
if (INLINE_AMD3DNOW(cpu_flags)) if (INLINE_AMD3DNOW(cpu_flags))
rgb2rgb_init_3DNOW(); rgb2rgb_init_3dnow();
if (INLINE_MMXEXT(cpu_flags)) if (INLINE_MMXEXT(cpu_flags))
rgb2rgb_init_MMXEXT(); rgb2rgb_init_mmxext();
if (INLINE_SSE2(cpu_flags)) if (INLINE_SSE2(cpu_flags))
rgb2rgb_init_SSE2(); rgb2rgb_init_sse2();
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
} }

8
libswscale/x86/swscale.c
View File

@ -74,7 +74,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
#undef RENAME #undef RENAME
#define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _MMX #define RENAME(a) a ## _mmx
#include "swscale_template.c" #include "swscale_template.c"
#endif #endif
@ -83,7 +83,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#undef RENAME #undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT #undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1 #define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _MMXEXT #define RENAME(a) a ## _mmxext
#include "swscale_template.c" #include "swscale_template.c"
#endif #endif
@ -308,11 +308,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
if (cpu_flags & AV_CPU_FLAG_MMX) if (cpu_flags & AV_CPU_FLAG_MMX)
sws_init_swscale_MMX(c); sws_init_swscale_mmx(c);
#endif #endif
#if HAVE_MMXEXT_INLINE #if HAVE_MMXEXT_INLINE
if (cpu_flags & AV_CPU_FLAG_MMXEXT) if (cpu_flags & AV_CPU_FLAG_MMXEXT)
sws_init_swscale_MMXEXT(c); sws_init_swscale_mmxext(c);
#endif #endif
#define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \ #define ASSIGN_SCALE_FUNC2(hscalefn, filtersize, opt1, opt2) do { \

30
libswscale/x86/yuv2rgb.c
View File

@ -54,7 +54,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME #undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT #undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _MMX #define RENAME(a) a ## _mmx
#include "yuv2rgb_template.c" #include "yuv2rgb_template.c"
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */
@ -63,7 +63,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME #undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT #undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1 #define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _MMXEXT #define RENAME(a) a ## _mmxext
#include "yuv2rgb_template.c" #include "yuv2rgb_template.c"
#endif /* HAVE_MMXEXT_INLINE */ #endif /* HAVE_MMXEXT_INLINE */
@ -82,9 +82,9 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
if (cpu_flags & AV_CPU_FLAG_MMXEXT) { if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
switch (c->dstFormat) { switch (c->dstFormat) {
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
return yuv420_rgb24_MMXEXT; return yuv420_rgb24_mmxext;
case AV_PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
return yuv420_bgr24_MMXEXT; return yuv420_bgr24_mmxext;
} }
} }
#endif #endif
@ -94,21 +94,27 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
case AV_PIX_FMT_RGB32: case AV_PIX_FMT_RGB32:
if (c->srcFormat == AV_PIX_FMT_YUVA420P) { if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return yuva420_rgb32_MMX; return yuva420_rgb32_mmx;
#endif #endif
break; break;
} else return yuv420_rgb32_MMX; } else
return yuv420_rgb32_mmx;
case AV_PIX_FMT_BGR32: case AV_PIX_FMT_BGR32:
if (c->srcFormat == AV_PIX_FMT_YUVA420P) { if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA #if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return yuva420_bgr32_MMX; return yuva420_bgr32_mmx;
#endif #endif
break; break;
} else return yuv420_bgr32_MMX; } else
case AV_PIX_FMT_RGB24: return yuv420_rgb24_MMX; return yuv420_bgr32_mmx;
case AV_PIX_FMT_BGR24: return yuv420_bgr24_MMX; case AV_PIX_FMT_RGB24:
case AV_PIX_FMT_RGB565: return yuv420_rgb16_MMX; return yuv420_rgb24_mmx;
case AV_PIX_FMT_RGB555: return yuv420_rgb15_MMX; case AV_PIX_FMT_BGR24:
return yuv420_bgr24_mmx;
case AV_PIX_FMT_RGB565:
return yuv420_rgb16_mmx;
case AV_PIX_FMT_RGB555:
return yuv420_rgb15_mmx;
} }
} }
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */