X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fbswap.h;h=93a6016b8c635dd56f67ebc17bde51afa99dc9ff;hb=4ede1862dc62f4cac030a171099d8ec8a9b079ab;hp=86a2492a20194504952c1e0f5a1257fe78b270f6;hpb=987903826b0dba2e134be200ac94be66b4a3acf1;p=ffmpeg diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 86a2492a201..93a6016b8c6 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -1,25 +1,25 @@ /* * copyright (c) 2006 Michael Niedermayer * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file bswap.h + * @file * byte swapping routines */ @@ -27,106 +27,85 @@ #define AVUTIL_BSWAP_H #include +#include "libavutil/avconfig.h" +#include "attributes.h" + +#ifdef HAVE_AV_CONFIG_H + #include "config.h" -#include "common.h" -#ifdef HAVE_BYTESWAP_H -#include -#else +#if ARCH_AARCH64 +# include "aarch64/bswap.h" +#elif ARCH_ARM +# include "arm/bswap.h" +#elif ARCH_AVR32 +# include "avr32/bswap.h" +#elif ARCH_BFIN +# include "bfin/bswap.h" +#elif ARCH_SH4 +# include "sh4/bswap.h" +#elif ARCH_X86 +# include "x86/bswap.h" +#endif + +#endif /* HAVE_AV_CONFIG_H */ + +#define AV_BSWAP16C(x) (((x) << 8 & 0xff00) | ((x) >> 8 & 0x00ff)) +#define AV_BSWAP32C(x) (AV_BSWAP16C(x) << 16 | AV_BSWAP16C((x) >> 16)) +#define AV_BSWAP64C(x) (AV_BSWAP32C(x) << 32 | AV_BSWAP32C((x) >> 32)) -static av_always_inline av_const uint16_t bswap_16(uint16_t x) +#define AV_BSWAPC(s, x) AV_BSWAP##s##C(x) + +#ifndef av_bswap16 +static av_always_inline av_const uint16_t av_bswap16(uint16_t x) { -#if defined(ARCH_X86) - asm("rorw $8, %0" : "+r"(x)); -#elif defined(ARCH_SH4) - asm("swap.b %0,%0" : "=r"(x) : "0"(x)); -#elif defined(HAVE_ARMV6) - asm("rev16 %0, %0" : "+r"(x)); -#else x= (x>>8) | (x<<8); -#endif return x; } +#endif -static av_always_inline av_const uint32_t bswap_32(uint32_t x) +#ifndef av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { -#if defined(ARCH_X86) -#ifdef HAVE_BSWAP - asm("bswap %0" : "+r" (x)); -#else - asm("rorw $8, %w0 \n\t" - "rorl $16, %0 \n\t" - "rorw $8, %w0" - : "+r"(x)); -#endif -#elif defined(ARCH_SH4) - asm("swap.b %0,%0\n" - "swap.w %0,%0\n" - "swap.b %0,%0\n" - : "=r"(x) : "0"(x)); -#elif defined(HAVE_ARMV6) - asm("rev %0, %0" : "+r"(x)); -#elif defined(ARCH_ARMV4L) - uint32_t t; - asm ("eor %1, %0, %0, ror #16 \n\t" - "bic %1, %1, #0xFF0000 \n\t" - "mov %0, %0, ror #8 \n\t" - "eor %0, %0, %1, lsr #8 \n\t" - : "+r"(x), "+r"(t)); -#elif defined(ARCH_BFIN) - unsigned tmp; - asm("%1 = %0 >> 8 (V); \n\t" - "%0 = %0 << 8 (V); \n\t" - "%0 = %0 | %1; \n\t" - "%0 = PACK(%0.L, %0.H); \n\t" - : "+d"(x), "=&d"(tmp)); -#else - x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF); - x= (x>>16) | (x<<16); -#endif - return x; + return AV_BSWAP32C(x); } +#endif -static inline uint64_t av_const bswap_64(uint64_t x) +#ifndef av_bswap64 +static inline uint64_t av_const av_bswap64(uint64_t x) { -#if 0 - x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL); - x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL); - return (x>>32) | (x<<32); -#elif defined(ARCH_X86_64) - asm("bswap %0": "=r" (x) : "0" (x)); - return x; -#else - union { - uint64_t ll; - uint32_t l[2]; - } w, r; - w.ll = x; - r.l[0] = bswap_32 (w.l[1]); - r.l[1] = bswap_32 (w.l[0]); - return r.ll; -#endif + return (uint64_t)av_bswap32(x) << 32 | av_bswap32(x >> 32); } +#endif -#endif /* !HAVE_BYTESWAP_H */ - -// be2me ... BigEndian to MachineEndian -// le2me ... LittleEndian to MachineEndian +// be2ne ... big-endian to native-endian +// le2ne ... little-endian to native-endian -#ifdef WORDS_BIGENDIAN -#define be2me_16(x) (x) -#define be2me_32(x) (x) -#define be2me_64(x) (x) -#define le2me_16(x) bswap_16(x) -#define le2me_32(x) bswap_32(x) -#define le2me_64(x) bswap_64(x) +#if AV_HAVE_BIGENDIAN +#define av_be2ne16(x) (x) +#define av_be2ne32(x) (x) +#define av_be2ne64(x) (x) +#define av_le2ne16(x) av_bswap16(x) +#define av_le2ne32(x) av_bswap32(x) +#define av_le2ne64(x) av_bswap64(x) +#define AV_BE2NEC(s, x) (x) +#define AV_LE2NEC(s, x) AV_BSWAPC(s, x) #else -#define be2me_16(x) bswap_16(x) -#define be2me_32(x) bswap_32(x) -#define be2me_64(x) bswap_64(x) -#define le2me_16(x) (x) -#define le2me_32(x) (x) -#define le2me_64(x) (x) +#define av_be2ne16(x) av_bswap16(x) +#define av_be2ne32(x) av_bswap32(x) +#define av_be2ne64(x) av_bswap64(x) +#define av_le2ne16(x) (x) +#define av_le2ne32(x) (x) +#define av_le2ne64(x) (x) +#define AV_BE2NEC(s, x) AV_BSWAPC(s, x) +#define AV_LE2NEC(s, x) (x) #endif +#define AV_BE2NE16C(x) AV_BE2NEC(16, x) +#define AV_BE2NE32C(x) AV_BE2NEC(32, x) +#define AV_BE2NE64C(x) AV_BE2NEC(64, x) +#define AV_LE2NE16C(x) AV_LE2NEC(16, x) +#define AV_LE2NE32C(x) AV_LE2NEC(32, x) +#define AV_LE2NE64C(x) AV_LE2NEC(64, x) + #endif /* AVUTIL_BSWAP_H */