dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-28 14:38:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "VP8LoadNewBytes: use __builtin_bswap32 if available"

Browse Source
This commit is contained in:
pascal massimino 2014-06-25 02:15:17 -07:00 committed by Gerrit Code Review
commit 8e867051fd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/bit_reader_inl.h
View File

@ -41,6 +41,12 @@ typedef uint8_t lbit_t;
#define __BIG_ENDIAN__ #define __BIG_ENDIAN__
#endif #endif
// gcc 4.3 has builtin functions for swap32/swap64
#if defined(__GNUC__) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
#define HAVE_BUILTIN_BSWAP
#endif
extern const uint8_t kVP8Log2Range[128]; extern const uint8_t kVP8Log2Range[128];
extern const range_t kVP8NewRange[128]; extern const range_t kVP8NewRange[128];
@ -77,9 +83,7 @@ static WEBP_INLINE void VP8LoadNewBytes(VP8BitReader* const br) {
br->buf_ += BITS >> 3; br->buf_ += BITS >> 3;
#if !defined(__BIG_ENDIAN__) #if !defined(__BIG_ENDIAN__)
#if (BITS > 32) #if (BITS > 32)
// gcc 4.3 has builtin functions for swap32/swap64 #if defined(HAVE_BUILTIN_BSWAP)
#if defined(__GNUC__) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
bits = (bit_t)__builtin_bswap64(in_bits); bits = (bit_t)__builtin_bswap64(in_bits);
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
bits = (bit_t)_byteswap_uint64(in_bits); bits = (bit_t)_byteswap_uint64(in_bits);
@ -96,7 +100,9 @@ static WEBP_INLINE void VP8LoadNewBytes(VP8BitReader* const br) {
#endif #endif
bits >>= 64 - BITS; bits >>= 64 - BITS;
#elif (BITS >= 24) #elif (BITS >= 24)
#if defined(__i386__) || defined(__x86_64__) #if defined(HAVE_BUILTIN_BSWAP)
bits = (bit_t)__builtin_bswap32(in_bits);
#elif defined(__i386__) || defined(__x86_64__)
{ {
lbit_t swapped_in_bits; lbit_t swapped_in_bits;
__asm__ volatile("bswap %k0" : "=r"(swapped_in_bits) : "0"(in_bits)); __asm__ volatile("bswap %k0" : "=r"(swapped_in_bits) : "0"(in_bits));
@ -114,7 +120,7 @@ static WEBP_INLINE void VP8LoadNewBytes(VP8BitReader* const br) {
bits = (bit_t)(in_bits >> 8) | ((in_bits & 0xff) << 8); bits = (bit_t)(in_bits >> 8) | ((in_bits & 0xff) << 8);
#else // BITS == 8 #else // BITS == 8
bits = (bit_t)in_bits; bits = (bit_t)in_bits;
#endif #endif // BITS > 32
#else // BIG_ENDIAN #else // BIG_ENDIAN
bits = (bit_t)in_bits; bits = (bit_t)in_bits;
if (BITS != 8 * sizeof(bit_t)) bits >>= (8 * sizeof(bit_t) - BITS); if (BITS != 8 * sizeof(bit_t)) bits >>= (8 * sizeof(bit_t) - BITS);