O_DIRECT works!!!

[frescor/ffmpeg.git] / libavutil / bswap.h

diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index b35fb5161334c63518235ab8153e6cafff533835..cf68c43c72007044645a029e367a977c6d283029 100644 (file)
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -19,79 +19,51 @@
  */
 
 /**
- * @file bswap.h
+ * @file libavutil/bswap.h
  * byte swapping routines
  */
 
-#ifndef FFMPEG_BSWAP_H
-#define FFMPEG_BSWAP_H
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
 
 #include <stdint.h>
 #include "config.h"
 #include "common.h"
 
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
+#if   ARCH_ARM
+#   include "arm/bswap.h"
+#elif ARCH_BFIN
+#   include "bfin/bswap.h"
+#elif ARCH_SH4
+#   include "sh4/bswap.h"
+#elif ARCH_X86
+#   include "x86/bswap.h"
+#endif
 
+#ifndef bswap_16
 static av_always_inline av_const uint16_t bswap_16(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));
-#else
     x= (x>>8) | (x<<8);
-#endif
     return x;
 }
+#endif
 
+#ifndef bswap_32
 static av_always_inline av_const uint32_t bswap_32(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(ARCH_ARM)
-    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;
 }
+#endif
 
+#ifndef bswap_64
 static inline uint64_t av_const bswap_64(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;
@@ -103,11 +75,10 @@ static inline uint64_t av_const bswap_64(uint64_t x)
     return r.ll;
 #endif
 }
+#endif
 
-#endif  /* !HAVE_BYTESWAP_H */
-
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
+// be2me ... big-endian to machine-endian
+// le2me ... little-endian to machine-endian
 
 #ifdef WORDS_BIGENDIAN
 #define be2me_16(x) (x)
@@ -125,4 +96,4 @@ static inline uint64_t av_const bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* FFMPEG_BSWAP_H */
+#endif /* AVUTIL_BSWAP_H */