Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/x86/fft.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of FFmpeg. 2 * This file is part of FFmpeg.
3 * 3 *
4 * FFmpeg is free software; you can redistribute it and/or 4 * FFmpeg is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version. 7 * version 2.1 of the License, or (at your option) any later version.
8 * 8 *
9 * FFmpeg is distributed in the hope that it will be useful, 9 * FFmpeg is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details. 12 * Lesser General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Lesser General Public 14 * You should have received a copy of the GNU Lesser General Public
15 * License along with FFmpeg; if not, write to the Free Software 15 * License along with FFmpeg; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17 */ 17 */
18 18
19 #include "libavutil/cpu.h"
19 #include "libavcodec/dsputil.h" 20 #include "libavcodec/dsputil.h"
20 #include "fft.h" 21 #include "fft.h"
21 22
22 av_cold void ff_fft_init_mmx(FFTContext *s) 23 av_cold void ff_fft_init_mmx(FFTContext *s)
23 { 24 {
24 #if HAVE_YASM 25 #if HAVE_YASM
25 int has_vectors = mm_support(); 26 int has_vectors = av_get_cpu_flags();
26 if (has_vectors & FF_MM_SSE && HAVE_SSE) { 27 if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE) {
27 /* SSE for P3/P4/K8 */ 28 /* SSE for P3/P4/K8 */
28 s->imdct_calc = ff_imdct_calc_sse; 29 s->imdct_calc = ff_imdct_calc_sse;
29 s->imdct_half = ff_imdct_half_sse; 30 s->imdct_half = ff_imdct_half_sse;
30 s->fft_permute = ff_fft_permute_sse; 31 s->fft_permute = ff_fft_permute_sse;
31 s->fft_calc = ff_fft_calc_sse; 32 s->fft_calc = ff_fft_calc_sse;
32 } else if (has_vectors & FF_MM_3DNOWEXT && HAVE_AMD3DNOWEXT) { 33 } else if (has_vectors & AV_CPU_FLAG_3DNOWEXT && HAVE_AMD3DNOWEXT) {
33 /* 3DNowEx for K7 */ 34 /* 3DNowEx for K7 */
34 s->imdct_calc = ff_imdct_calc_3dn2; 35 s->imdct_calc = ff_imdct_calc_3dn2;
35 s->imdct_half = ff_imdct_half_3dn2; 36 s->imdct_half = ff_imdct_half_3dn2;
36 s->fft_calc = ff_fft_calc_3dn2; 37 s->fft_calc = ff_fft_calc_3dn2;
37 } else if (has_vectors & FF_MM_3DNOW && HAVE_AMD3DNOW) { 38 } else if (has_vectors & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW) {
38 /* 3DNow! for K6-2/3 */ 39 /* 3DNow! for K6-2/3 */
39 s->imdct_calc = ff_imdct_calc_3dn; 40 s->imdct_calc = ff_imdct_calc_3dn;
40 s->imdct_half = ff_imdct_half_3dn; 41 s->imdct_half = ff_imdct_half_3dn;
41 s->fft_calc = ff_fft_calc_3dn; 42 s->fft_calc = ff_fft_calc_3dn;
42 } 43 }
43 #endif 44 #endif
44 } 45 }
45 46
46 #if CONFIG_DCT 47 #if CONFIG_DCT
47 av_cold void ff_dct_init_mmx(DCTContext *s) 48 av_cold void ff_dct_init_mmx(DCTContext *s)
48 { 49 {
49 int has_vectors = mm_support(); 50 int has_vectors = av_get_cpu_flags();
50 if (has_vectors & FF_MM_SSE && HAVE_SSE) 51 if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE)
51 s->dct32 = ff_dct32_float_sse; 52 s->dct32 = ff_dct32_float_sse;
52 } 53 }
53 #endif 54 #endif
54 55
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/x86/dsputilenc_mmx.c ('k') | source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn2.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698