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

Merge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622' 

* commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622':
  fft: x86: cosmetics: Drop silly comments, add comment, whitespace

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-12 15:42:14 +01:00
parent 6e2ca81485 73ff983e8d
commit d496d52d02
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/x86/fft_init.c
View File

@ -17,9 +17,11 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "fft.h" #include "fft.h"
av_cold void ff_fft_init_x86(FFTContext *s) av_cold void ff_fft_init_x86(FFTContext *s)
@ -31,28 +33,27 @@ av_cold void ff_fft_init_x86(FFTContext *s)
#if ARCH_X86_32 #if ARCH_X86_32
if (EXTERNAL_AMD3DNOW(cpu_flags)) { if (EXTERNAL_AMD3DNOW(cpu_flags)) {
/* 3DNow! for K6-2/3 */
s->imdct_calc = ff_imdct_calc_3dnow; s->imdct_calc = ff_imdct_calc_3dnow;
s->imdct_half = ff_imdct_half_3dnow; s->imdct_half = ff_imdct_half_3dnow;
s->fft_calc = ff_fft_calc_3dnow; s->fft_calc = ff_fft_calc_3dnow;
} }
if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) { if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) {
/* 3DNowEx for K7 */
s->imdct_calc = ff_imdct_calc_3dnowext; s->imdct_calc = ff_imdct_calc_3dnowext;
s->imdct_half = ff_imdct_half_3dnowext; s->imdct_half = ff_imdct_half_3dnowext;
s->fft_calc = ff_fft_calc_3dnowext; s->fft_calc = ff_fft_calc_3dnowext;
} }
#endif #endif /* ARCH_X86_32 */
if (EXTERNAL_SSE(cpu_flags)) { if (EXTERNAL_SSE(cpu_flags)) {
/* SSE for P3/P4/K8 */
s->imdct_calc = ff_imdct_calc_sse; s->imdct_calc = ff_imdct_calc_sse;
s->imdct_half = ff_imdct_half_sse; s->imdct_half = ff_imdct_half_sse;
s->fft_permute = ff_fft_permute_sse; s->fft_permute = ff_fft_permute_sse;
s->fft_calc = ff_fft_calc_sse; s->fft_calc = ff_fft_calc_sse;
s->fft_permutation = FF_FFT_PERM_SWAP_LSBS; s->fft_permutation = FF_FFT_PERM_SWAP_LSBS;
} }
if (EXTERNAL_AVX_FAST(cpu_flags) && s->nbits >= 5) { if (EXTERNAL_AVX_FAST(cpu_flags) && s->nbits >= 5) {
/* AVX for SB */
s->imdct_half = ff_imdct_half_avx; s->imdct_half = ff_imdct_half_avx;
s->fft_calc = ff_fft_calc_avx; s->fft_calc = ff_fft_calc_avx;
s->fft_permutation = FF_FFT_PERM_AVX; s->fft_permutation = FF_FFT_PERM_AVX;