diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:25:55 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:26:42 +0100 |
| commit | af2e6f32156ecd18664551215680c662e61aa57a (patch) | |
| tree | 229c8c88bbd6d295f658cd39cd13f572e17b5567 | |
| parent | 4cf66a81932a1f3775b8952ebe010be067990674 (diff) | |
| parent | 64034849dad8410bedbe1def4c533490fb85cc4a (diff) | |
| download | ffmpeg-af2e6f32156ecd18664551215680c662e61aa57a.tar.gz | |
Merge commit '64034849dad8410bedbe1def4c533490fb85cc4a'
* commit '64034849dad8410bedbe1def4c533490fb85cc4a':
arm64: add cycle counter support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavutil/aarch64/timer.h | 44 | ||||
| -rw-r--r-- | libavutil/timer.h | 4 |
2 files changed, 47 insertions, 1 deletions
diff --git a/libavutil/aarch64/timer.h b/libavutil/aarch64/timer.h new file mode 100644 index 0000000000..b570039416 --- /dev/null +++ b/libavutil/aarch64/timer.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2015 Janne Grunau <janne-libav@jannau.net> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_AARCH64_TIMER_H +#define AVUTIL_AARCH64_TIMER_H + +#include <stdint.h> +#include "config.h" + +#if HAVE_INLINE_ASM + +#define AV_READ_TIME read_time + +static inline uint64_t read_time(void) +{ + uint64_t cycle_counter; + __asm__ volatile( + "isb \t\n" + "mrs %0, pmccntr_el0 " + : "=r"(cycle_counter) :: "memory" ); + + return cycle_counter; +} + +#endif /* HAVE_INLINE_ASM */ + +#endif /* AVUTIL_AARCH64_TIMER_H */ diff --git a/libavutil/timer.h b/libavutil/timer.h index e21f6552bd..ed3b047870 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -38,7 +38,9 @@ #include "log.h" -#if ARCH_ARM +#if ARCH_AARCH64 +# include "aarch64/timer.h" +#elif ARCH_ARM # include "arm/timer.h" #elif ARCH_PPC # include "ppc/timer.h" |