diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 05:22:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 05:23:03 +0100 |
| commit | 53e6977c07a8720cf4f785ef23686bf34b5cec57 (patch) | |
| tree | 4c66c986729fbc08a5352bf545fd6e609f23b39c /libavutil | |
| parent | 9d228676132920992e46bfb57f036072ba3ce93b (diff) | |
| parent | d0cd2a8c461f975eeaeff2900e95fa8ec0931ef8 (diff) | |
| download | ffmpeg-53e6977c07a8720cf4f785ef23686bf34b5cec57.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: bswap inline assembly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/aarch64/bswap.h | 50 | ||||
| -rw-r--r-- | libavutil/bswap.h | 4 |
2 files changed, 53 insertions, 1 deletions
diff --git a/libavutil/aarch64/bswap.h b/libavutil/aarch64/bswap.h new file mode 100644 index 0000000000..1e735c52cf --- /dev/null +++ b/libavutil/aarch64/bswap.h @@ -0,0 +1,50 @@ +/* + * 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_BSWAP_H +#define AVUTIL_AARCH64_BSWAP_H + +#include <stdint.h> +#include "config.h" +#include "libavutil/attributes.h" + +#if HAVE_INLINE_ASM + +#define av_bswap16 av_bswap16 +static av_always_inline av_const unsigned av_bswap16(unsigned x) +{ + __asm__("rev16 %w0, %w0" : "+r"(x)); + return x; +} + +#define av_bswap32 av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) +{ + __asm__("rev %w0, %w0" : "+r"(x)); + return x; +} + +#define av_bswap64 av_bswap64 +static av_always_inline av_const uint64_t av_bswap64(uint64_t x) +{ + __asm__("rev %0, %0" : "+r"(x)); + return x; +} + +#endif /* HAVE_INLINE_ASM */ +#endif /* AVUTIL_AARCH64_BSWAP_H */ diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 06f654816d..f38e1dec83 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -34,7 +34,9 @@ #include "config.h" -#if ARCH_ARM +#if ARCH_AARCH64 +# include "aarch64/bswap.h" +#elif ARCH_ARM # include "arm/bswap.h" #elif ARCH_AVR32 # include "avr32/bswap.h" |