The motion compensation routines are now modules as well ; choose your

[vlc] / include / common.h

diff --git a/include/common.h b/include/common.h
index bebf59a0cc6f7bc5394f4fd29ebb8f7419e38bfc..92f6b8aa726846a0855da74c16dc088934b6eb97 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.20 2001/01/05 18:46:43 massiot Exp $
+ * $Id: common.h,v 1.25 2001/01/18 05:13:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -37,10 +37,10 @@
 typedef u8                  byte_t;
 
 /* Boolean type */
-#ifndef SYS_SOLARIS
-typedef int                 boolean_t;
-#else
+#ifdef BOOLEAN_T_IN_SYS_TYPES_H
 #   include <sys/types.h>
+#else
+typedef int                 boolean_t;
 #endif
 #ifdef SYS_GNU
 #   define _MACH_I386_BOOLEAN_H_
@@ -61,6 +61,13 @@ typedef int                 ptrdiff_t;
 /* Counter for statistics and profiling */
 typedef unsigned long       count_t;
 
+/* DCT elements types */
+#ifndef VDEC_DFT
+typedef short dctelem_t;
+#else
+typedef int dctelem_t;
+#endif
+
 /*****************************************************************************
  * Classes declaration
  *****************************************************************************/
@@ -121,6 +128,9 @@ typedef struct vdec_thread_s *          p_vdec_thread_t;
 typedef struct vpar_thread_s *          p_vpar_thread_t;
 typedef struct video_parser_s *         p_video_parser_t;
 
+/* Misc */
+struct macroblock_s;
+
 /*****************************************************************************
  * Macros and inline functions
  *****************************************************************************/
@@ -145,31 +155,55 @@ typedef struct video_parser_s *         p_video_parser_t;
 #define MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
 #endif
 
+/*
+ * This is stolen from the livid source who stole it from the kernel
+ */
+
+#if defined(SYS_BEOS)
+#   define swab32(x) B_BENDIAN_TO_HOST_INT32(x)
+#else
+#   ifdef WORDS_BIG_ENDIAN
+#       define swab32(x) (x)
+#   else
+#       if defined (HAVE_X86_BSWAP)
+static __inline__ const u32 __i386_swab32( u32 x )
+{
+    __asm__("bswap %0" : "=r" (x) : "0" (x));
+    return x;
+}
+#           define swab32(x) __i386_swab32(x)
+#       else
+#           define swab32(x)                                                 \
+            ( ( (u32)(((u8*)&x)[0]) << 24 ) | ( (u32)(((u8*)&x)[1]) << 16 ) |\
+              ( (u32)(((u8*)&x)[2]) << 8 )  | ( (u32)(((u8*)&x)[3])) )
+#       endif
+#   endif
+#endif
+
 /* MSB (big endian)/LSB (little endian) conversions - network order is always
  * MSB, and should be used for both network communications and files. Note that
  * byte orders other than little and big endians are not supported, but only
  * the VAX seems to have such exotic properties - note that these 'functions'
  * needs <netinet/in.h> or the local equivalent. */
-/* FIXME??: hton64 should be declared as an extern inline function to avoid border
- * effects (see byteorder.h) */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+/* FIXME: hton64 should be declared as an extern inline function to avoid
+ * border effects (see byteorder.h) */
+#if WORDS_BIGENDIAN
 #define hton16      htons
 #define hton32      htonl
-#define hton64(i)   ( ((u64)(htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ) )
+#define hton64(i)   ( i )
 #define ntoh16      ntohs
 #define ntoh32      ntohl
-#define ntoh64      hton64
-#elif __BYTE_ORDER == __BIG_ENDIAN
+#define ntoh64(i)   ( i )
+#else
 #define hton16      htons
 #define hton32      htonl
-#define hton64(i)   ( i )
+#define hton64(i)   ( ((u64)(htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ) )
 #define ntoh16      ntohs
 #define ntoh32      ntohl
-#define ntoh64(i)   ( i )
-#else
-/* XXX??: cause a compilation error */
+#define ntoh64      hton64
 #endif
 
 /* Macros with automatic casts */
-#define U32_AT(p)   ( ntohl ( *( (u32 *)(p) ) ) )
+#define U32_AT(p)   ( swab32 ( *( (u32 *)(p) ) ) )
 #define U16_AT(p)   ( ntohs ( *( (u16 *)(p) ) ) )
+