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

Side by Side Diff: patched-ffmpeg-mt/libavutil/arm/timer.h

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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 * Copyright (c) 2009 Mans Rullgard <mans@mansr.com> 2 * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
11 * FFmpeg is distributed in the hope that it will be useful, 11 * FFmpeg is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Lesser General Public License for more details. 14 * Lesser General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Lesser General Public 16 * You should have received a copy of the GNU Lesser General Public
17 * License along with FFmpeg; if not, write to the Free Software 17 * License along with FFmpeg; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 */ 19 */
20 20
21 #ifndef AVUTIL_ARM_TIMER_H 21 #ifndef AVUTIL_ARM_TIMER_H
22 #define AVUTIL_ARM_TIMER_H 22 #define AVUTIL_ARM_TIMER_H
23 23
24 #include <stdint.h> 24 #include <stdint.h>
25 #include "config.h"
25 26
26 #if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) 27 #if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
27 28
28 #define AV_READ_TIME read_time 29 #define AV_READ_TIME read_time
29 30
30 static inline uint64_t read_time(void) 31 static inline uint64_t read_time(void)
31 { 32 {
32 unsigned cc; 33 unsigned cc;
33 __asm__ volatile ("mrc p15, 0, %0, c9, c13, 0" : "=r"(cc)); 34 __asm__ volatile ("mrc p15, 0, %0, c9, c13, 0" : "=r"(cc));
34 return cc; 35 return cc;
35 } 36 }
36 37
37 #endif /* HAVE_INLINE_ASM && __ARM_ARCH_7A__ */ 38 #endif /* HAVE_INLINE_ASM && __ARM_ARCH_7A__ */
38 39
39 #endif /* AVUTIL_ARM_TIMER_H */ 40 #endif /* AVUTIL_ARM_TIMER_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698