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

libswr: remove redundant ARCH_X86, MMX* implicates X86

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-07 22:31:37 +02:00
parent 5f256f9df2
commit 070b0e1c77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswresample/resample.c
View File

@ -375,7 +375,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
#undef FILTER_SHIFT #undef FILTER_SHIFT
// XXX FIXME the whole C loop should be written in asm so this x86 specific code here isnt needed // XXX FIXME the whole C loop should be written in asm so this x86 specific code here isnt needed
#if ARCH_X86 && HAVE_MMXEXT_INLINE #if HAVE_MMXEXT_INLINE
#include "x86/resample_mmx.h" #include "x86/resample_mmx.h"
#define COMMON_CORE COMMON_CORE_INT16_MMX2 #define COMMON_CORE COMMON_CORE_INT16_MMX2
#define RENAME(N) N ## _int16_mmx2 #define RENAME(N) N ## _int16_mmx2
@ -415,7 +415,7 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
d = (unsigned)(v + 32768) > 65535 ? (v>>31) ^ 32767 : v d = (unsigned)(v + 32768) > 65535 ? (v>>31) ^ 32767 : v
#include "resample_template.c" #include "resample_template.c"
#endif #endif
#endif // ARCH_X86 #endif // HAVE_MMXEXT_INLINE
int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, AudioData *src, int src_size, int *consumed){
int i, ret= -1; int i, ret= -1;
@ -423,7 +423,7 @@ int swri_multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, Aud
int need_emms= 0; int need_emms= 0;
for(i=0; i<dst->ch_count; i++){ for(i=0; i<dst->ch_count; i++){
#if ARCH_X86 && HAVE_MMXEXT_INLINE #if HAVE_MMXEXT_INLINE
#if HAVE_SSSE3_INLINE #if HAVE_SSSE3_INLINE
if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSSE3)) ret= swri_resample_int16_ssse3(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count); if(c->format == AV_SAMPLE_FMT_S16P && (mm_flags&AV_CPU_FLAG_SSSE3)) ret= swri_resample_int16_ssse3(c, (int16_t*)dst->ch[i], (const int16_t*)src->ch[i], consumed, src_size, dst_size, i+1==dst->ch_count);
else else