virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

Browse Source 
* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
	libswscale/x86/rgb2rgb.c
	libswscale/x86/swscale.c

See: 1de064e21e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-23 12:01:42 +01:00
commit 8733b363ac
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswscale/x86/swscale.c
View File

@ -71,7 +71,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#if HAVE_MMX_INLINE
#undef RENAME
#define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _MMX
#define RENAME(a) a ## _mmx
#include "swscale_template.c"
#endif
@ -80,7 +80,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _MMXEXT
#define RENAME(a) a ## _mmxext
#include "swscale_template.c"
#endif
@ -206,7 +206,7 @@ static void yuv2yuvX_sse3(const int16_t *filter, int filterSize,
const uint8_t *dither, int offset)
{
if(((int)dest) & 15){
return yuv2yuvX_MMXEXT(filter, filterSize, src, dest, dstW, dither, offset);
return yuv2yuvX_mmxext(filter, filterSize, src, dest, dstW, dither, offset);
}
if (offset) {
__asm__ volatile("movq (%0), %%xmm3\n\t"
@ -383,11 +383,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c)
#if HAVE_MMX_INLINE
if (cpu_flags & AV_CPU_FLAG_MMX)
sws_init_swscale_MMX(c);
sws_init_swscale_mmx(c);
#endif
#if HAVE_MMXEXT_INLINE
if (cpu_flags & AV_CPU_FLAG_MMXEXT)
sws_init_swscale_MMXEXT(c);
sws_init_swscale_mmxext(c);
if (cpu_flags & AV_CPU_FLAG_SSE3){
if(c->use_mmx_vfilter && !(c->flags & SWS_ACCURATE_RND))
c->yuv2planeX = yuv2yuvX_sse3;

30
libswscale/x86/yuv2rgb.c
View File

@ -53,7 +53,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 0
#define RENAME(a) a ## _MMX
#define RENAME(a) a ## _mmx
#include "yuv2rgb_template.c"
#endif /* HAVE_MMX_INLINE */
@ -62,7 +62,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL;
#undef RENAME
#undef COMPILE_TEMPLATE_MMXEXT
#define COMPILE_TEMPLATE_MMXEXT 1
#define RENAME(a) a ## _MMXEXT
#define RENAME(a) a ## _mmxext
#include "yuv2rgb_template.c"
#endif /* HAVE_MMXEXT_INLINE */
@ -77,9 +77,9 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
if (cpu_flags & AV_CPU_FLAG_MMXEXT) {
switch (c->dstFormat) {
case AV_PIX_FMT_RGB24:
return yuv420_rgb24_MMXEXT;
return yuv420_rgb24_mmxext;
case AV_PIX_FMT_BGR24:
return yuv420_bgr24_MMXEXT;
return yuv420_bgr24_mmxext;
}
}
#endif
@ -89,21 +89,27 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
case AV_PIX_FMT_RGB32:
if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return yuva420_rgb32_MMX;
return yuva420_rgb32_mmx;
#endif
break;
} else return yuv420_rgb32_MMX;
} else
return yuv420_rgb32_mmx;
case AV_PIX_FMT_BGR32:
if (c->srcFormat == AV_PIX_FMT_YUVA420P) {
#if HAVE_7REGS && CONFIG_SWSCALE_ALPHA
return yuva420_bgr32_MMX;
return yuva420_bgr32_mmx;
#endif
break;
} else return yuv420_bgr32_MMX;
case AV_PIX_FMT_RGB24: return yuv420_rgb24_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;
} else
return yuv420_bgr32_mmx;
case AV_PIX_FMT_RGB24:
return yuv420_rgb24_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 */