* common.h: common definitions
* Collection of useful common types and macros definitions
*****************************************************************************
- * Copyright (C) 1998-2005 the VideoLAN team
- * $Id$
+ * Copyright (C) 1998-2011 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
+ * Rémi Denis-Courmont
*
* 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
# include <stdbool.h>
#endif
-/* Format string sanity checks */
+/* Helper for GCC version checks */
#ifdef __GNUC__
-# define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
-# define LIBVLC_USED __attribute__ ((warn_unused_result))
+# define VLC_GCC_VERSION(maj,min) \
+ ((__GNUC__ > (maj)) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min)))
#else
-# define LIBVLC_FORMAT(x,y)
-# define LIBVLC_USED
+# define VLC_GCC_VERSION(maj,min) (0)
#endif
+/* Try to fix format strings for all versions of mingw and mingw64 */
+#if defined( _WIN32 ) && defined( __USE_MINGW_ANSI_STDIO )
+ #undef PRId64
+ #define PRId64 "lld"
+ #undef PRIi64
+ #define PRIi64 "lli"
+ #undef PRIu64
+ #define PRIu64 "llu"
+ #undef PRIo64
+ #define PRIo64 "llo"
+ #undef PRIx64
+ #define PRIx64 "llx"
+#endif
+
+/* Function attributes for compiler warnings */
+#ifdef __GNUC__
+# define VLC_DEPRECATED __attribute__((deprecated))
+
+# if defined( _WIN32 ) && VLC_GCC_VERSION(4,4)
+# define VLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
+# else
+# define VLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))
+# endif
+# define VLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
+
+# define VLC_MALLOC __attribute__ ((malloc))
+# define VLC_NORETURN __attribute__ ((noreturn))
+
+# if VLC_GCC_VERSION(3,4)
+# define VLC_USED __attribute__ ((warn_unused_result))
+# else
+# define VLC_USED
+# endif
+
+#else
+# define VLC_DEPRECATED
+# define VLC_FORMAT(x,y)
+# define VLC_FORMAT_ARG(x)
+# define VLC_MALLOC
+# define VLC_NORETURN
+# define VLC_USED
+#endif
+
+
+/* Branch prediction */
+#ifdef __GNUC__
+# define likely(p) __builtin_expect(!!(p), 1)
+# define unlikely(p) __builtin_expect(!!(p), 0)
+#else
+# define likely(p) (!!(p))
+# define unlikely(p) (!!(p))
+#endif
+
+/* Linkage */
+#ifdef __cplusplus
+# define VLC_EXTERN extern "C"
+#else
+# define VLC_EXTERN
+#endif
+
+#if defined (WIN32) && defined (DLL_EXPORT)
+# define VLC_EXPORT __declspec(dllexport)
+#elif VLC_GCC_VERSION(4,0)
+# define VLC_EXPORT __attribute__((visibility("default")))
+#else
+# define VLC_EXPORT
+#endif
+
+#define VLC_API VLC_EXTERN VLC_EXPORT
+
+
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
# endif
#endif
+#ifdef __SYMBIAN32__
+ #include <sys/syslimits.h>
+#endif
+
/* Counter for statistics and profiling */
typedef unsigned long count_t;
* \param fcc a vlc_fourcc_t
* \param psz_fourcc string to store string representation of vlc_fourcc in
*/
-static inline void __vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc )
+static inline void vlc_fourcc_to_char( vlc_fourcc_t fcc, char *psz_fourcc )
{
memcpy( psz_fourcc, &fcc, 4 );
}
#define vlc_fourcc_to_char( a, b ) \
- __vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) )
+ vlc_fourcc_to_char( (vlc_fourcc_t)(a), (char *)(b) )
/*****************************************************************************
* Classes declaration
typedef struct vlc_object_t vlc_object_t;
typedef struct libvlc_int_t libvlc_int_t;
typedef struct date_t date_t;
-typedef struct dict_entry_t dict_entry_t;
-typedef struct dict_t dict_t;
/* Playlist */
typedef struct playlist_t playlist_t;
typedef struct playlist_item_t playlist_item_t;
typedef struct playlist_view_t playlist_view_t;
-typedef struct playlist_export_t playlist_export_t;
typedef struct services_discovery_t services_discovery_t;
typedef struct services_discovery_sys_t services_discovery_sys_t;
typedef struct playlist_add_t playlist_add_t;
/* Modules */
-typedef struct module_bank_t module_bank_t;
typedef struct module_t module_t;
typedef struct module_config_t module_config_t;
-typedef struct module_symbols_t module_symbols_t;
-typedef struct module_cache_t module_cache_t;
typedef struct config_category_t config_category_t;
/* Input */
typedef struct input_thread_t input_thread_t;
-typedef struct input_thread_sys_t input_thread_sys_t;
typedef struct input_item_t input_item_t;
+typedef struct input_item_node_t input_item_node_t;
typedef struct access_t access_t;
typedef struct access_sys_t access_sys_t;
typedef struct stream_t stream_t;
typedef struct stream_sys_t stream_sys_t;
typedef struct demux_t demux_t;
-typedef struct demux_meta_t demux_meta_t;
typedef struct demux_sys_t demux_sys_t;
typedef struct es_out_t es_out_t;
typedef struct es_out_id_t es_out_id_t;
typedef struct es_out_sys_t es_out_sys_t;
-typedef struct es_descriptor_t es_descriptor_t;
typedef struct seekpoint_t seekpoint_t;
typedef struct info_t info_t;
typedef struct info_category_t info_category_t;
typedef struct video_palette_t video_palette_t;
/* Audio */
-typedef struct aout_instance_t aout_instance_t;
+typedef struct audio_output audio_output_t;
typedef struct aout_sys_t aout_sys_t;
typedef struct aout_fifo_t aout_fifo_t;
typedef struct aout_input_t aout_input_t;
-typedef struct aout_buffer_t aout_buffer_t;
+typedef struct block_t aout_buffer_t;
typedef audio_format_t audio_sample_format_t;
-typedef struct audio_date_t audio_date_t;
-typedef struct aout_filter_t aout_filter_t;
/* Video */
typedef struct vout_thread_t vout_thread_t;
-typedef struct vout_sys_t vout_sys_t;
typedef video_format_t video_frame_format_t;
typedef struct picture_t picture_t;
typedef struct picture_sys_t picture_sys_t;
-typedef struct picture_heap_t picture_heap_t;
/* Subpictures */
typedef struct spu_t spu_t;
typedef struct subpicture_t subpicture_t;
typedef struct subpicture_sys_t subpicture_sys_t;
typedef struct subpicture_region_t subpicture_region_t;
-typedef struct text_style_t text_style_t;
typedef struct image_handler_t image_handler_t;
typedef struct config_chain_t config_chain_t;
typedef struct session_descriptor_t session_descriptor_t;
-typedef struct announce_method_t announce_method_t;
-
-typedef struct sout_param_t sout_param_t;
-typedef struct sout_pcat_t sout_pcat_t;
-typedef struct sout_std_t sout_std_t;
-typedef struct sout_display_t sout_display_t;
-typedef struct sout_duplicate_t sout_duplicate_t;
-typedef struct sout_transcode_t sout_transcode_t;
-typedef struct sout_chain_t sout_chain_t;
-typedef struct streaming_profile_t streaming_profile_t;
-typedef struct sout_module_t sout_module_t;
-typedef struct sout_gui_descr_t sout_gui_descr_t;
-typedef struct profile_parser_t profile_parser_t;
/* Decoders */
typedef struct decoder_t decoder_t;
typedef struct filter_sys_t filter_sys_t;
/* Network */
-typedef struct network_socket_t network_socket_t;
typedef struct virtual_socket_t v_socket_t;
-typedef struct sockaddr sockaddr;
-typedef struct addrinfo addrinfo;
typedef struct vlc_acl_t vlc_acl_t;
typedef struct vlc_url_t vlc_url_t;
/* Misc */
typedef struct iso639_lang_t iso639_lang_t;
-typedef struct device_t device_t;
-typedef struct device_probe_t device_probe_t;
-typedef struct probe_sys_t probe_sys_t;
/* block */
typedef struct block_t block_t;
typedef struct httpd_redirect_t httpd_redirect_t;
typedef struct httpd_stream_t httpd_stream_t;
-/* TLS support */
-typedef struct tls_server_t tls_server_t;
-typedef struct tls_session_t tls_session_t;
-
/* Hashing */
typedef struct md5_s md5_t;
typedef struct vod_sys_t vod_sys_t;
typedef struct vod_media_t vod_media_t;
-/* opengl */
-typedef struct opengl_t opengl_t;
-typedef struct opengl_sys_t opengl_sys_t;
-
/* osdmenu */
typedef struct osd_menu_t osd_menu_t;
typedef struct osd_state_t osd_state_t;
typedef struct vlm_t vlm_t;
typedef struct vlm_message_t vlm_message_t;
-/* divers */
+/* misc */
typedef struct vlc_meta_t vlc_meta_t;
-typedef struct meta_export_t meta_export_t;
/* Stats */
typedef struct counter_t counter_t;
/* stat/lstat/fstat */
#ifdef WIN32
-#include <sys/stat.h>
+# include <sys/stat.h>
# ifndef UNDER_CE
struct _stati64;
-#define stat _stati64
-#define fstat _fstati64
+# define stat _stati64
+# define fstat _fstati64
#endif
-/* You should otherwise use utf8_stat and utf8_lstat. */
+/* You should otherwise use vlc_stat and vlc_lstat. */
#else
struct stat;
#endif
*/
typedef union
{
- int i_int;
+ int64_t i_int;
bool b_bool;
float f_float;
char * psz_string;
vlc_object_t * p_object;
vlc_list_t * p_list;
mtime_t i_time;
-
- struct { char *psz_name; int i_object_id; } var;
-
- /* Make sure the structure is at least 64bits */
- struct { char a, b, c, d, e, f, g, h; } padding;
+ struct { int32_t x; int32_t y; } coords;
} vlc_value_t;
};
-/**
- * \defgroup var_type Variable types
- * These are the different types a vlc variable can have.
- * @{
- */
-#define VLC_VAR_VOID 0x0010
-#define VLC_VAR_BOOL 0x0020
-#define VLC_VAR_INTEGER 0x0030
-#define VLC_VAR_HOTKEY 0x0031
-#define VLC_VAR_STRING 0x0040
-#define VLC_VAR_MODULE 0x0041
-#define VLC_VAR_FILE 0x0042
-#define VLC_VAR_DIRECTORY 0x0043
-#define VLC_VAR_VARIABLE 0x0044
-#define VLC_VAR_FLOAT 0x0050
-#define VLC_VAR_TIME 0x0060
-#define VLC_VAR_ADDRESS 0x0070
-#define VLC_VAR_MUTEX 0x0080
-#define VLC_VAR_LIST 0x0090
-/**@}*/
-
/*****************************************************************************
* Error values (shouldn't be exposed)
*****************************************************************************/
#define VLC_SUCCESS -0 /* No error */
#define VLC_ENOMEM -1 /* Not enough memory */
-#define VLC_ETHREAD -2 /* Thread error */
#define VLC_ETIMEOUT -3 /* Timeout */
#define VLC_ENOMOD -10 /* Module not found */
vlc_value_t, /* new value */
void * ); /* callback data */
-/*****************************************************************************
- * Plug-in stuff
- *****************************************************************************/
-
-#ifdef __cplusplus
-# define LIBVLC_EXTERN extern "C"
-#else
-# define LIBVLC_EXTERN extern
-#endif
-#if defined (WIN32) && defined (DLL_EXPORT)
-#if defined (UNDER_CE)
-# include <windef.h>
-#endif
-# define LIBVLC_EXPORT __declspec(dllexport)
-#else
-# define LIBVLC_EXPORT
-#endif
-#define VLC_EXPORT( type, name, args ) \
- LIBVLC_EXTERN LIBVLC_EXPORT type name args
-
/*****************************************************************************
* OS-specific headers and thread types
*****************************************************************************/
#if defined( WIN32 ) || defined( UNDER_CE )
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
+/* WIN32_LEAN_AND_MEAN is needed to be able to include winsock2.h because else,
+ * windows.h will also include winsock.h and declarations will conflict */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
#endif
#include "vlc_mtime.h"
#include "vlc_threads.h"
+/**
+ * Memory storage space for an atom. Never access it directly.
+ */
+typedef union
+{
+ volatile uintptr_t u;
+ volatile intptr_t s;
+} vlc_atomic_t;
+
/*****************************************************************************
* Common structure members
*****************************************************************************/
*/ \
/**@{*/ \
const char *psz_object_type; \
- char *psz_object_name; \
\
/* Messages header */ \
char *psz_header; \
int i_flags; \
\
/* Object properties */ \
- volatile bool b_error; /**< set by the object */ \
volatile bool b_die; /**< set by the outside */ \
bool b_force; /**< set by the outside (eg. module_need()) */ \
\
- /** Just a reminder so that people don't cast garbage */ \
- bool be_sure_to_add_VLC_COMMON_MEMBERS_to_struct; \
- \
/* Stuff related to the libvlc structure */ \
libvlc_int_t *p_libvlc; /**< (root of all evil) - 1 */ \
\
vlc_object_t * p_parent; /**< our parent */ \
\
- /* Private data */ \
- void * p_private; \
- \
/**@}*/ \
/* VLC_OBJECT: attempt at doing a clever cast */
-#ifdef __GNUC__
-# define VLC_OBJECT( x ) \
- (((vlc_object_t *)(x))+0*(((typeof(x))0)->be_sure_to_add_VLC_COMMON_MEMBERS_to_struct))
+#if VLC_GCC_VERSION(4,0)
+# ifndef __cplusplus
+# define VLC_OBJECT( x ) \
+ __builtin_choose_expr( \
+ __builtin_offsetof(__typeof__(*(x)), psz_object_type), \
+ (void)0 /* screw you */, \
+ (vlc_object_t *)(x))
+# else
+# define VLC_OBJECT( x ) \
+ ((vlc_object_t *)(x) \
+ + 0 * __builtin_offsetof(__typeof__(*(x)), psz_object_type))
+# endif
#else
# define VLC_OBJECT( x ) ((vlc_object_t *)(x))
#endif
typedef struct gc_object_t
{
- vlc_spinlock_t spin;
- uintptr_t refs;
+ vlc_atomic_t refs;
void (*pf_destructor) (struct gc_object_t *);
} gc_object_t;
*/
#define VLC_GC_MEMBERS gc_object_t vlc_gc_data;
-VLC_EXPORT(void *, vlc_gc_init, (gc_object_t *, void (*)(gc_object_t *)));
-VLC_EXPORT(void *, vlc_hold, (gc_object_t *));
-VLC_EXPORT(void, vlc_release, (gc_object_t *));
+VLC_API void * vlc_gc_init(gc_object_t *, void (*)(gc_object_t *));
+VLC_API void * vlc_hold(gc_object_t *);
+VLC_API void vlc_release(gc_object_t *);
#define vlc_gc_init( a,b ) vlc_gc_init( &(a)->vlc_gc_data, (b) )
#define vlc_gc_incref( a ) vlc_hold( &(a)->vlc_gc_data )
# define __MIN(a, b) ( ((a) < (b)) ? (a) : (b) )
#endif
-LIBVLC_USED
+VLC_USED
static inline int64_t GCD ( int64_t a, int64_t b )
{
while( b )
}
/* function imported from libavutil/common.h */
-LIBVLC_USED
+VLC_USED
static inline uint8_t clip_uint8_vlc( int32_t a )
{
if( a&(~255) ) return (-a)>>31;
else return a;
}
+/** Count leading zeroes */
+VLC_USED
+static inline unsigned clz (unsigned x)
+{
+#if VLC_GCC_VERSION(3,4)
+ return __builtin_clz (x);
+#else
+ unsigned i = sizeof (x) * 8;
+
+ while (x)
+ {
+ x = x >> 1;
+ i--;
+ }
+ return i;
+#endif
+}
+
+#define clz8( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint8_t)) * 8))
+#define clz16( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint16_t)) * 8))
+/* XXX: this assumes that int is 32-bits or more */
+#define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8))
+
+/** Bit weight */
+VLC_USED
+static inline unsigned popcount (unsigned x)
+{
+#if VLC_GCC_VERSION(3,4)
+ return __builtin_popcount (x);
+#else
+ unsigned count = 0;
+ while (x)
+ {
+ count += x & 1;
+ x = x >> 1;
+ }
+ return count;
+#endif
+}
+
+/** Byte swap (16 bits) */
+VLC_USED
+static inline uint16_t bswap16 (uint16_t x)
+{
+ return (x << 8) | (x >> 8);
+}
+
+/** Byte swap (32 bits) */
+VLC_USED
+static inline uint32_t bswap32 (uint32_t x)
+{
+#if VLC_GCC_VERSION(4,3)
+ return __builtin_bswap32 (x);
+#else
+ return ((x & 0x000000FF) << 24)
+ | ((x & 0x0000FF00) << 8)
+ | ((x & 0x00FF0000) >> 8)
+ | ((x & 0xFF000000) >> 24);
+#endif
+}
+
+/** Byte swap (64 bits) */
+VLC_USED
+static inline uint64_t bswap64 (uint64_t x)
+{
+#if VLC_GCC_VERSION(4,3)
+ return __builtin_bswap64 (x);
+#elif !defined (__cplusplus)
+ return ((x & 0x00000000000000FF) << 56)
+ | ((x & 0x000000000000FF00) << 40)
+ | ((x & 0x0000000000FF0000) << 24)
+ | ((x & 0x00000000FF000000) << 8)
+ | ((x & 0x000000FF00000000) >> 8)
+ | ((x & 0x0000FF0000000000) >> 24)
+ | ((x & 0x00FF000000000000) >> 40)
+ | ((x & 0xFF00000000000000) >> 56);
+#else
+ return ((x & 0x00000000000000FFLLU) << 56)
+ | ((x & 0x000000000000FF00LLU) << 40)
+ | ((x & 0x0000000000FF0000LLU) << 24)
+ | ((x & 0x00000000FF000000LLU) << 8)
+ | ((x & 0x000000FF00000000LLU) >> 8)
+ | ((x & 0x0000FF0000000000LLU) >> 24)
+ | ((x & 0x00FF000000000000LLU) >> 40)
+ | ((x & 0xFF00000000000000LLU) >> 56);
+#endif
+}
+
+
/* Free and set set the variable to NULL */
#define FREENULL(a) do { free( a ); a = NULL; } while(0)
#define EMPTY_STR(str) (!str || !*str)
-VLC_EXPORT( char const *, vlc_error, ( int ) LIBVLC_USED );
+VLC_API char const * vlc_error( int ) VLC_USED;
#include <vlc_arrays.h>
/* MSB (big endian)/LSB (little endian) conversions - network order is always
* MSB, and should be used for both network communications and files. */
-LIBVLC_USED
-static inline uint16_t U16_AT( const void * _p )
-{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint16_t)p[0] << 8) | p[1] );
-}
-LIBVLC_USED
-static inline uint32_t U32_AT( const void * _p )
+#ifdef WORDS_BIGENDIAN
+# define hton16(i) ((uint16_t)(i))
+# define hton32(i) ((uint32_t)(i))
+# define hton64(i) ((uint64_t)(i))
+#else
+# define hton16(i) bswap16(i)
+# define hton32(i) bswap32(i)
+# define hton64(i) bswap64(i)
+#endif
+#define ntoh16(i) hton16(i)
+#define ntoh32(i) hton32(i)
+#define ntoh64(i) hton64(i)
+
+/** Reads 16 bits in network byte order */
+VLC_USED
+static inline uint16_t U16_AT (const void *p)
{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
- | ((uint32_t)p[2] << 8) | p[3] );
+ uint16_t x;
+
+ memcpy (&x, p, sizeof (x));
+ return ntoh16 (x);
}
-LIBVLC_USED
-static inline uint64_t U64_AT( const void * _p )
+/** Reads 32 bits in network byte order */
+VLC_USED
+static inline uint32_t U32_AT (const void *p)
{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48)
- | ((uint64_t)p[2] << 40) | ((uint64_t)p[3] << 32)
- | ((uint64_t)p[4] << 24) | ((uint64_t)p[5] << 16)
- | ((uint64_t)p[6] << 8) | p[7] );
+ uint32_t x;
+
+ memcpy (&x, p, sizeof (x));
+ return ntoh32 (x);
}
-LIBVLC_USED
-static inline uint16_t GetWLE( const void * _p )
+/** Reads 64 bits in network byte order */
+VLC_USED
+static inline uint64_t U64_AT (const void *p)
{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint16_t)p[1] << 8) | p[0] );
+ uint64_t x;
+
+ memcpy (&x, p, sizeof (x));
+ return ntoh64 (x);
}
-LIBVLC_USED
-static inline uint32_t GetDWLE( const void * _p )
+#define GetWBE(p) U16_AT(p)
+#define GetDWBE(p) U32_AT(p)
+#define GetQWBE(p) U64_AT(p)
+
+/** Reads 16 bits in little-endian order */
+VLC_USED
+static inline uint16_t GetWLE (const void *p)
{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint32_t)p[3] << 24) | ((uint32_t)p[2] << 16)
- | ((uint32_t)p[1] << 8) | p[0] );
+ uint16_t x;
+
+ memcpy (&x, p, sizeof (x));
+#ifdef WORDS_BIGENDIAN
+ x = bswap16 (x);
+#endif
+ return x;
}
-LIBVLC_USED
-static inline uint64_t GetQWLE( const void * _p )
+/** Reads 32 bits in little-endian order */
+VLC_USED
+static inline uint32_t GetDWLE (const void *p)
{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint64_t)p[7] << 56) | ((uint64_t)p[6] << 48)
- | ((uint64_t)p[5] << 40) | ((uint64_t)p[4] << 32)
- | ((uint64_t)p[3] << 24) | ((uint64_t)p[2] << 16)
- | ((uint64_t)p[1] << 8) | p[0] );
-}
+ uint32_t x;
-#define GetWBE( p ) U16_AT( p )
-#define GetDWBE( p ) U32_AT( p )
-#define GetQWBE( p ) U64_AT( p )
+ memcpy (&x, p, sizeof (x));
+#ifdef WORDS_BIGENDIAN
+ x = bswap32 (x);
+#endif
+ return x;
+}
-/* Helper writer functions */
-#define SetWLE( p, v ) _SetWLE( (uint8_t*)(p), v)
-static inline void _SetWLE( uint8_t *p, uint16_t i_dw )
+/** Reads 64 bits in little-endian order */
+VLC_USED
+static inline uint64_t GetQWLE (const void *p)
{
- p[1] = ( i_dw >> 8 )&0xff;
- p[0] = ( i_dw )&0xff;
+ uint64_t x;
+
+ memcpy (&x, p, sizeof (x));
+#ifdef WORDS_BIGENDIAN
+ x = bswap64 (x);
+#endif
+ return x;
}
-#define SetDWLE( p, v ) _SetDWLE( (uint8_t*)(p), v)
-static inline void _SetDWLE( uint8_t *p, uint32_t i_dw )
+/** Writes 16 bits in network byte order */
+static inline void SetWBE (void *p, uint16_t w)
{
- p[3] = ( i_dw >> 24 )&0xff;
- p[2] = ( i_dw >> 16 )&0xff;
- p[1] = ( i_dw >> 8 )&0xff;
- p[0] = ( i_dw )&0xff;
+ w = hton16 (w);
+ memcpy (p, &w, sizeof (w));
}
-#define SetQWLE( p, v ) _SetQWLE( (uint8_t*)(p), v)
-static inline void _SetQWLE( uint8_t *p, uint64_t i_qw )
+
+/** Writes 32 bits in network byte order */
+static inline void SetDWBE (void *p, uint32_t dw)
{
- SetDWLE( p, i_qw&0xffffffff );
- SetDWLE( p+4, ( i_qw >> 32)&0xffffffff );
+ dw = hton32 (dw);
+ memcpy (p, &dw, sizeof (dw));
}
-#define SetWBE( p, v ) _SetWBE( (uint8_t*)(p), v)
-static inline void _SetWBE( uint8_t *p, uint16_t i_dw )
+
+/** Writes 64 bits in network byte order */
+static inline void SetQWBE (void *p, uint64_t qw)
{
- p[0] = ( i_dw >> 8 )&0xff;
- p[1] = ( i_dw )&0xff;
+ qw = hton64 (qw);
+ memcpy (p, &qw, sizeof (qw));
}
-#define SetDWBE( p, v ) _SetDWBE( (uint8_t*)(p), v)
-static inline void _SetDWBE( uint8_t *p, uint32_t i_dw )
+/** Writes 16 bits in little endian order */
+static inline void SetWLE (void *p, uint16_t w)
{
- p[0] = ( i_dw >> 24 )&0xff;
- p[1] = ( i_dw >> 16 )&0xff;
- p[2] = ( i_dw >> 8 )&0xff;
- p[3] = ( i_dw )&0xff;
+#ifdef WORDS_BIGENDIAN
+ w = bswap16 (w);
+#endif
+ memcpy (p, &w, sizeof (w));
}
-#define SetQWBE( p, v ) _SetQWBE( (uint8_t*)(p), v)
-static inline void _SetQWBE( uint8_t *p, uint64_t i_qw )
+
+/** Writes 32 bits in little endian order */
+static inline void SetDWLE (void *p, uint32_t dw)
{
- SetDWBE( p+4, i_qw&0xffffffff );
- SetDWBE( p, ( i_qw >> 32)&0xffffffff );
+#ifdef WORDS_BIGENDIAN
+ dw = bswap32 (dw);
+#endif
+ memcpy (p, &dw, sizeof (dw));
}
-#define hton16(i) htons(i)
-#define hton32(i) htonl(i)
-#define ntoh16(i) ntohs(i)
-#define ntoh32(i) ntohl(i)
-
-LIBVLC_USED
-static inline uint64_t ntoh64 (uint64_t ll)
+/** Writes 64 bits in little endian order */
+static inline void SetQWLE (void *p, uint64_t qw)
{
- union { uint64_t qw; uint8_t b[16]; } v = { ll };
- return ((uint64_t)v.b[0] << 56)
- | ((uint64_t)v.b[1] << 48)
- | ((uint64_t)v.b[2] << 40)
- | ((uint64_t)v.b[3] << 32)
- | ((uint64_t)v.b[4] << 24)
- | ((uint64_t)v.b[5] << 16)
- | ((uint64_t)v.b[6] << 8)
- | ((uint64_t)v.b[7] << 0);
+#ifdef WORDS_BIGENDIAN
+ qw = bswap64 (qw);
+#endif
+ memcpy (p, &qw, sizeof (qw));
}
-#define hton64(i) ntoh64(i)
/* */
#define VLC_UNUSED(x) (void)(x)
/* win32, cl and icl support */
# if defined( _MSC_VER ) || !defined( __MINGW32__ )
# define __attribute__(x)
-# define __inline__ __inline
# define S_IFBLK 0x3000 /* Block */
# define S_ISBLK(m) (0)
# define S_ISCHR(m) (0)
# endif
# endif
-# if defined( _MSC_VER ) && !defined( __WXMSW__ )
+# if defined( _MSC_VER )
# if !defined( _OFF_T_DEFINED )
typedef __int64 off_t;
# define _OFF_T_DEFINED
# include <tchar.h>
#endif
-VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) );
+VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t );
-/* iconv wrappers (defined in src/extras/libc.c) */
-typedef void *vlc_iconv_t;
-VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) LIBVLC_USED );
-VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED );
-VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) );
+/* Aligned memory allocator */
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
-/* execve wrapper (defined in src/extras/libc.c) */
-VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED );
-#define vlc_execve(a,b,c,d,e,f,g,h,i) __vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
+#ifdef WIN32
+# include <malloc.h>
+# define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
+# define vlc_free(base) (__mingw_aligned_free(base))
+#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
+static inline void *vlc_memalign(size_t align, size_t size)
+{
+ long diff;
+ void *ptr;
+
+ ptr = malloc(size+align);
+ if(!ptr)
+ return ptr;
+ diff = ((-(long)ptr - 1)&(align-1)) + 1;
+ ptr = (char*)ptr + diff;
+ ((char*)ptr)[-1]= diff;
+ return ptr;
+}
-/* dir wrappers (defined in src/extras/libc.c) */
-VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir ));
+static void vlc_free(void *ptr)
+{
+ if (ptr)
+ free((char*)ptr - ((char*)ptr)[-1]);
+}
+#elif defined(__ANDROID__)
+# define vlc_memalign(align, size) memalign(align, size)
+# define vlc_free(base) free(base)
+#else
+static inline void *vlc_memalign(size_t align, size_t size)
+{
+ void *base;
+ if (unlikely(posix_memalign(&base, align, size)))
+ base = NULL;
+ return base;
+}
+# define vlc_free(base) free(base)
+#endif
-/*****************************************************************************
- * CPU capabilities
- *****************************************************************************/
-#define CPU_CAPABILITY_NONE 0
-#define CPU_CAPABILITY_486 (1<<0)
-#define CPU_CAPABILITY_586 (1<<1)
-#define CPU_CAPABILITY_PPRO (1<<2)
-#define CPU_CAPABILITY_MMX (1<<3)
-#define CPU_CAPABILITY_3DNOW (1<<4)
-#define CPU_CAPABILITY_MMXEXT (1<<5)
-#define CPU_CAPABILITY_SSE (1<<6)
-#define CPU_CAPABILITY_SSE2 (1<<7)
-#define CPU_CAPABILITY_ALTIVEC (1<<16)
-#define CPU_CAPABILITY_FPU (1<<31)
-VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
-
-typedef void *(*vlc_memcpy_t) (void *tgt, const void *src, size_t n);
-typedef void *(*vlc_memset_t) (void *tgt, int c, size_t n);
-
-VLC_EXPORT( void, vlc_fastmem_register, (vlc_memcpy_t cpy, vlc_memset_t set) );
-VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) );
-VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
+VLC_API void vlc_tdestroy( void *, void (*)(void *) );
+
+/* Fast large memory copy and memory set */
+VLC_API void * vlc_memcpy( void *, const void *, size_t );
+#define vlc_memset memset
/*****************************************************************************
* I18n stuff
*****************************************************************************/
-VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) LIBVLC_USED );
+VLC_API char * vlc_gettext( const char *msgid ) VLC_FORMAT_ARG(1);
+
+#define vlc_pgettext( ctx, id ) \
+ vlc_pgettext_aux( ctx "\004" id, id )
-static inline const char *vlc_pgettext( const char *ctx, const char *id )
+VLC_FORMAT_ARG(2)
+static inline const char *vlc_pgettext_aux( const char *ctx, const char *id )
{
- const char *tr = vlc_gettext( id );
+ const char *tr = vlc_gettext( ctx );
return (tr == ctx) ? id : tr;
}
+/*****************************************************************************
+ * Loosy memory allocation functions. Do not use in new code.
+ *****************************************************************************/
+static inline void *xmalloc (size_t len)
+{
+ void *ptr = malloc (len);
+ if (unlikely (ptr == NULL))
+ abort ();
+ return ptr;
+}
+
+static inline void *xrealloc (void *ptr, size_t len)
+{
+ void *nptr = realloc (ptr, len);
+ if (unlikely (nptr == NULL))
+ abort ();
+ return nptr;
+}
+
+static inline void *xcalloc (size_t n, size_t size)
+{
+ void *ptr = calloc (n, size);
+ if (unlikely (ptr == NULL))
+ abort ();
+ return ptr;
+}
+
/*****************************************************************************
* libvlc features
*****************************************************************************/
-VLC_EXPORT( const char *, VLC_Version, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_CompileBy, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_CompileHost, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
-VLC_EXPORT( const char *, VLC_Error, ( int ) LIBVLC_USED );
+VLC_API const char * VLC_CompileBy( void ) VLC_USED;
+VLC_API const char * VLC_CompileHost( void ) VLC_USED;
+VLC_API const char * VLC_Compiler( void ) VLC_USED;
/*****************************************************************************
* Additional vlc stuff
*****************************************************************************/
#include "vlc_messages.h"
-#include "vlc_variables.h"
#include "vlc_objects.h"
-#include "vlc_modules.h"
+#include "vlc_variables.h"
#include "vlc_main.h"
#include "vlc_configuration.h"
-#if defined( WIN32 ) || defined( UNDER_CE )
+#if defined( WIN32 ) || defined( UNDER_CE ) || defined( __SYMBIAN32__ ) || defined( __OS2__ )
# define DIR_SEP_CHAR '\\'
# define DIR_SEP "\\"
# define PATH_SEP_CHAR ';'
projects / vlc / blobdiff