* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: common.h,v 1.26 2001/01/18 17:40:06 massiot Exp $
*
- * Authors:
+ * Authors: Samuel Hocevar <sam@via.ecp.fr>
+ * Vincent Seguin <seguin@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
typedef u8 byte_t;
/* Boolean type */
+#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_
+# define _MACH_I386_BOOLEAN_H_
+#endif
+
+/* ptrdiff_t definition */
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#else
+# include <malloc.h>
+# ifndef _PTRDIFF_T
+# define _PTRDIFF_T
+/* Not portable in a 64-bit environment. */
+typedef int ptrdiff_t;
+# endif
#endif
/* 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
*****************************************************************************/
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
*****************************************************************************/
+#ifdef NTOHL_IN_SYS_PARAM_H
+# include <sys/param.h>
+#else
+# include <netinet/in.h>
+#endif
+
/* CEIL: division with round to nearest greater integer */
#define CEIL(n, d) ( ((n) / (d)) + ( ((n) % (d)) ? 1 : 0) )
#define MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
#endif
-/* MSB (big endian)/LSB (little endian) convertions - network order is always
+/* 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 used by input to access the TS buffer */
-#define U32_AT(p) ( ntohl ( *( (u32 *)(p) ) ) )
-#define U16_AT(p) ( ntohs ( *( (u16 *)(p) ) ) )
+/* Macros with automatic casts */
+#define U64_AT(p) ( ntoh64 ( *( (u64 *)(p) ) ) )
+#define U32_AT(p) ( ntoh32 ( *( (u32 *)(p) ) ) )
+#define U16_AT(p) ( ntoh16 ( *( (u16 *)(p) ) ) )
+