generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

Browse Source 
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
	libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-04 01:17:39 +02:00
commit 5c65aed7fd
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/x86/mpegvideoenc.c
View File

@ -36,8 +36,8 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
#define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_MMXEXT 0
#define COMPILE_TEMPLATE_SSE2 0 #define COMPILE_TEMPLATE_SSE2 0
#define COMPILE_TEMPLATE_SSSE3 0 #define COMPILE_TEMPLATE_SSSE3 0
#define RENAME(a) a ## _MMX #define RENAME(a) a ## _mmx
#define RENAMEl(a) a ## _mmx #define RENAME_FDCT(a) a ## _mmx
#include "mpegvideoenc_template.c" #include "mpegvideoenc_template.c"
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */
@ -49,9 +49,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
#define COMPILE_TEMPLATE_SSE2 0 #define COMPILE_TEMPLATE_SSE2 0
#define COMPILE_TEMPLATE_SSSE3 0 #define COMPILE_TEMPLATE_SSSE3 0
#undef RENAME #undef RENAME
#undef RENAMEl #undef RENAME_FDCT
#define RENAME(a) a ## _MMXEXT #define RENAME(a) a ## _mmxext
#define RENAMEl(a) a ## _mmxext #define RENAME_FDCT(a) a ## _mmxext
#include "mpegvideoenc_template.c" #include "mpegvideoenc_template.c"
#endif /* HAVE_MMXEXT_INLINE */ #endif /* HAVE_MMXEXT_INLINE */
@ -63,9 +63,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
#define COMPILE_TEMPLATE_SSE2 1 #define COMPILE_TEMPLATE_SSE2 1
#define COMPILE_TEMPLATE_SSSE3 0 #define COMPILE_TEMPLATE_SSSE3 0
#undef RENAME #undef RENAME
#undef RENAMEl #undef RENAME_FDCT
#define RENAME(a) a ## _SSE2 #define RENAME(a) a ## _sse2
#define RENAMEl(a) a ## _sse2 #define RENAME_FDCT(a) a ## _sse2
#include "mpegvideoenc_template.c" #include "mpegvideoenc_template.c"
#endif /* HAVE_SSE2_INLINE */ #endif /* HAVE_SSE2_INLINE */
@ -77,9 +77,9 @@ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64];
#define COMPILE_TEMPLATE_SSE2 1 #define COMPILE_TEMPLATE_SSE2 1
#define COMPILE_TEMPLATE_SSSE3 1 #define COMPILE_TEMPLATE_SSSE3 1
#undef RENAME #undef RENAME
#undef RENAMEl #undef RENAME_FDCT
#define RENAME(a) a ## _SSSE3 #define RENAME(a) a ## _ssse3
#define RENAMEl(a) a ## _sse2 #define RENAME_FDCT(a) a ## _sse2
#include "mpegvideoenc_template.c" #include "mpegvideoenc_template.c"
#endif /* HAVE_SSSE3_INLINE */ #endif /* HAVE_SSSE3_INLINE */
@ -210,26 +210,26 @@ av_cold void ff_dct_encode_init_x86(MpegEncContext *s)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (INLINE_MMX(cpu_flags)) { if (INLINE_MMX(cpu_flags)) {
#if HAVE_6REGS #if HAVE_6REGS
s->dct_quantize = dct_quantize_MMX; s->dct_quantize = dct_quantize_mmx;
#endif #endif
s->denoise_dct = denoise_dct_mmx; s->denoise_dct = denoise_dct_mmx;
} }
#endif #endif
#if HAVE_6REGS && HAVE_MMXEXT_INLINE #if HAVE_6REGS && HAVE_MMXEXT_INLINE
if (INLINE_MMXEXT(cpu_flags)) if (INLINE_MMXEXT(cpu_flags))
s->dct_quantize = dct_quantize_MMXEXT; s->dct_quantize = dct_quantize_mmxext;
#endif #endif
#if HAVE_SSE2_INLINE #if HAVE_SSE2_INLINE
if (INLINE_SSE2(cpu_flags)) { if (INLINE_SSE2(cpu_flags)) {
#if HAVE_6REGS #if HAVE_6REGS
s->dct_quantize = dct_quantize_SSE2; s->dct_quantize = dct_quantize_sse2;
#endif #endif
s->denoise_dct = denoise_dct_sse2; s->denoise_dct = denoise_dct_sse2;
} }
#endif #endif
#if HAVE_6REGS && HAVE_SSSE3_INLINE #if HAVE_6REGS && HAVE_SSSE3_INLINE
if (INLINE_SSSE3(cpu_flags)) if (INLINE_SSSE3(cpu_flags))
s->dct_quantize = dct_quantize_SSSE3; s->dct_quantize = dct_quantize_ssse3;
#endif #endif
} }
} }

2
libavcodec/x86/mpegvideoenc_template.c
View File

@ -109,7 +109,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
av_assert2((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly? av_assert2((7&(int)(&temp_block[0])) == 0); //did gcc align it correctly?
//s->fdct (block); //s->fdct (block);
RENAMEl(ff_fdct) (block); //cannot be anything else ... RENAME_FDCT(ff_fdct)(block); // cannot be anything else ...
if(s->dct_error_sum) if(s->dct_error_sum)
s->denoise_dct(s, block); s->denoise_dct(s, block);