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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/x86/mpegaudiodec_mmx.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 * MMX optimized MP3 decoding functions 2 * MMX optimized MP3 decoding functions
3 * Copyright (c) 2010 Vitor Sessak 3 * Copyright (c) 2010 Vitor Sessak
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
11 * 11 *
12 * FFmpeg is distributed in the hope that it will be useful, 12 * FFmpeg is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details. 15 * Lesser General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Lesser General Public 17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software 18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */ 20 */
21 21
22 #include "libavutil/cpu.h"
22 #include "libavutil/x86_cpu.h" 23 #include "libavutil/x86_cpu.h"
23 24
24 #define CONFIG_FLOAT 1 25 #define CONFIG_FLOAT 1
25 #include "libavcodec/mpegaudio.h" 26 #include "libavcodec/mpegaudio.h"
26 27
27 #define MACS(rt, ra, rb) rt+=(ra)*(rb) 28 #define MACS(rt, ra, rb) rt+=(ra)*(rb)
28 #define MLSS(rt, ra, rb) rt-=(ra)*(rb) 29 #define MLSS(rt, ra, rb) rt-=(ra)*(rb)
29 30
30 #define SUM8(op, sum, w, p) \ 31 #define SUM8(op, sum, w, p) \
31 { \ 32 { \
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 143 }
143 } 144 }
144 145
145 sum = 0; 146 sum = 0;
146 SUM8(MLSS, sum, win + 16 + 32, in + 32); 147 SUM8(MLSS, sum, win + 16 + 32, in + 32);
147 *out = sum; 148 *out = sum;
148 } 149 }
149 150
150 void ff_mpegaudiodec_init_mmx(MPADecodeContext *s) 151 void ff_mpegaudiodec_init_mmx(MPADecodeContext *s)
151 { 152 {
152 mm_flags = mm_support(); 153 int mm_flags = av_get_cpu_flags();
153 154
154 if (mm_flags & FF_MM_SSE2) { 155 if (mm_flags & AV_CPU_FLAG_SSE2) {
155 s->apply_window_mp3 = apply_window_mp3; 156 s->apply_window_mp3 = apply_window_mp3;
156 } 157 }
157 } 158 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c ('k') | source/patched-ffmpeg-mt/libavcodec/x86/mpegvideo_mmx.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698