1 files changed, 48 insertions, 84 deletions

diff --git a/contrib/ffmpeg/libavutil/bswap.h b/contrib/ffmpeg/libavutil/bswap.h
index 03d613db2..ee75f88c3 100644
--- a/contrib/ffmpeg/libavutil/bswap.h
+++ b/contrib/ffmpeg/libavutil/bswap.h
@@ -23,8 +23,11 @@
  * byte swap.
  */
 
-#ifndef __BSWAP_H__
-#define __BSWAP_H__
+#ifndef FFMPEG_BSWAP_H
+#define FFMPEG_BSWAP_H
+
+#include <stdint.h>
+#include "common.h"
 
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
@@ -36,101 +39,58 @@
 #  define LEGACY_REGS "=q"
 #endif
 
-#if defined(ARCH_X86)
 static av_always_inline uint16_t bswap_16(uint16_t x)
 {
-  __asm("rorw $8, %0"   :
-        LEGACY_REGS (x) :
-        "0" (x));
+#if defined(ARCH_X86)
+    __asm("rorw $8, %0"   :
+          LEGACY_REGS (x) :
+          "0" (x));
+#elif defined(ARCH_SH4)
+    __asm__("swap.b %0,%0":"=r"(x):"0"(x));
+#else
+    x= (x>>8) | (x<<8);
+#endif
     return x;
 }
 
 static av_always_inline uint32_t bswap_32(uint32_t x)
 {
+#if defined(ARCH_X86)
 #if __CPU__ != 386
- __asm("bswap   %0":
-      "=r" (x)     :
+    __asm("bswap   %0":
+          "=r" (x)    :
 #else
- __asm("xchgb   %b0,%h0\n"
-      "         rorl    $16,%0\n"
-      "         xchgb   %b0,%h0":
-      LEGACY_REGS (x)                :
+    __asm("xchgb   %b0,%h0\n"
+          "rorl    $16,%0 \n"
+          "xchgb   %b0,%h0":
+          LEGACY_REGS (x)  :
 #endif
-      "0" (x));
-  return x;
-}
-
-static inline uint64_t bswap_64(uint64_t x)
-{
-#ifdef ARCH_X86_64
-  __asm("bswap  %0":
-        "=r" (x)   :
-        "0" (x));
-  return x;
-#else
-    union {
-        uint64_t ll;
-        struct {
-           uint32_t l,h;
-        } l;
-    } r;
-    r.l.l = bswap_32 (x);
-    r.l.h = bswap_32 (x>>32);
-    return r.ll;
-#endif
-}
-
+          "0" (x));
 #elif defined(ARCH_SH4)
-
-static av_always_inline uint16_t bswap_16(uint16_t x) {
-        __asm__("swap.b %0,%0":"=r"(x):"0"(x));
-        return x;
-}
-
-static av_always_inline uint32_t bswap_32(uint32_t x) {
-        __asm__(
-        "swap.b %0,%0\n"
-        "swap.w %0,%0\n"
-        "swap.b %0,%0\n"
-        :"=r"(x):"0"(x));
-        return x;
-}
-
-static inline uint64_t bswap_64(uint64_t x)
-{
-    union {
-        uint64_t ll;
-        struct {
-           uint32_t l,h;
-        } l;
-    } r;
-    r.l.l = bswap_32 (x);
-    r.l.h = bswap_32 (x>>32);
-    return r.ll;
-}
-#else
-
-static av_always_inline uint16_t bswap_16(uint16_t x){
-    return (x>>8) | (x<<8);
-}
-
-#ifdef ARCH_ARM
-static av_always_inline uint32_t bswap_32(uint32_t x){
+    __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));
-    return x;
-}
+    __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
-static av_always_inline uint32_t bswap_32(uint32_t x){
     x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
-    return (x>>16) | (x<<16);
-}
+    x= (x>>16) | (x<<16);
 #endif
+    return x;
+}
 
 static inline uint64_t bswap_64(uint64_t x)
 {
@@ -138,6 +98,11 @@ static inline uint64_t bswap_64(uint64_t x)
     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;
@@ -149,7 +114,6 @@ static inline uint64_t bswap_64(uint64_t x)
     return r.ll;
 #endif
 }
-#endif  /* defined(ARCH_X86) */
 
 #endif  /* !HAVE_BYTESWAP_H */
 
@@ -172,4 +136,4 @@ static inline uint64_t bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* __BSWAP_H__ */
+#endif /* FFMPEG_BSWAP_H */