X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=9a5617c8c8252b25a229fd9344b48f5671781d05;hb=ec87e89b5950679bb48b714ebffd2ae7040b999b;hp=7060cb5c4180fa7835f7250797c33954d6d26339;hpb=b6366fc0b0182bd552ccb0276998601ed133f1ec;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index 7060cb5c41..9a5617c8c8 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -56,13 +56,46 @@ # include #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" + #define snprintf __mingw_snprintf + #define vsnprintf __mingw_vsnprintf +#endif + /* Format string sanity checks */ #ifdef __GNUC__ -# define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y))) +# if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) ) +# define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y))) +# else +# define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y))) +# endif +# define LIBVLC_FORMAT_ARG(x) __attribute__ ((format_arg(x))) # define LIBVLC_USED __attribute__ ((warn_unused_result)) +# define LIBVLC_MALLOC __attribute__ ((malloc)) #else # define LIBVLC_FORMAT(x,y) +# define LIBVLC_FORMAT_ARG(x) # define LIBVLC_USED +# define LIBVLC_MALLOC +#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 /***************************************************************************** @@ -123,13 +156,13 @@ typedef uint32_t vlc_fourcc_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 @@ -162,7 +195,6 @@ typedef enum { 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; @@ -176,25 +208,16 @@ typedef struct module_cache_t module_cache_t; typedef struct config_category_t config_category_t; -/* Interface */ -typedef struct intf_thread_t intf_thread_t; -typedef struct intf_sys_t intf_sys_t; -typedef struct intf_console_t intf_console_t; -typedef struct intf_msg_t intf_msg_t; -typedef struct interaction_t interaction_t; -typedef struct interaction_dialog_t interaction_dialog_t; -typedef struct user_widget_t user_widget_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; @@ -217,26 +240,23 @@ typedef struct aout_instance_t aout_instance_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; @@ -353,16 +373,14 @@ typedef struct osd_menu_state_t osd_menu_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; typedef struct counter_sample_t counter_sample_t; typedef struct stats_handler_t stats_handler_t; typedef struct input_stats_t input_stats_t; -typedef struct global_stats_t global_stats_t; /* Update */ typedef struct update_t update_t; @@ -381,7 +399,7 @@ struct _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 @@ -391,7 +409,7 @@ struct stat; */ typedef union { - int i_int; + int64_t i_int; bool b_bool; float f_float; char * psz_string; @@ -399,11 +417,7 @@ typedef union 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; @@ -436,7 +450,7 @@ struct vlc_list_t #define VLC_VAR_TIME 0x0060 #define VLC_VAR_ADDRESS 0x0070 #define VLC_VAR_MUTEX 0x0080 -#define VLC_VAR_LIST 0x0090 +#define VLC_VAR_COORDS 0x00A0 /**@}*/ /***************************************************************************** @@ -444,7 +458,6 @@ struct vlc_list_t *****************************************************************************/ #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 */ @@ -500,6 +513,15 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ #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 *****************************************************************************/ @@ -510,44 +532,41 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ * these members are common for all vlc objects \ */ \ /**@{*/ \ - int i_object_type; \ 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 defined( __GNUC__ ) && __GNUC__ > 3 +# 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; @@ -603,6 +622,29 @@ static inline uint8_t clip_uint8_vlc( int32_t a ) else return a; } +/* Count leading zeroes */ +LIBVLC_USED +static inline unsigned clz (unsigned x) +{ +#ifdef __GNUC_ + 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)) + /* Free and set set the variable to NULL */ #define FREENULL(a) do { free( a ); a = NULL; } while(0) @@ -736,11 +778,6 @@ static inline uint64_t ntoh64 (uint64_t ll) #define VLC_UNUSED(x) (void)(x) /* Stuff defined in src/extras/libc.c */ -VLC_EXPORT( size_t, vlc_strlcpy, ( char *, const char *, size_t ) ); -VLC_EXPORT( long long, vlc_strtoll, ( const char *nptr, char **endptr, int base ) LIBVLC_USED ); - -VLC_EXPORT( char *, vlc_strcasestr, ( const char *s1, const char *s2 ) LIBVLC_USED ); -char *vlc_strsep( char **, const char * ); #if defined(WIN32) || defined(UNDER_CE) /* win32, cl and icl support */ @@ -789,14 +826,6 @@ char *vlc_strsep( char **, const char * ); # ifndef alloca # define alloca _alloca -# endif - - /* These two are not defined in mingw32 (bug?) */ -# ifndef snprintf -# define snprintf _snprintf -# endif -# ifndef vsnprintf -# define vsnprintf _vsnprintf # endif # include @@ -804,9 +833,7 @@ char *vlc_strsep( char **, const char * ); VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); -/* vlc_wraptext (defined in src/extras/libc.c) */ -#define wraptext vlc_wraptext -VLC_EXPORT( char *, vlc_wraptext, ( const char *, int ) LIBVLC_USED ); +VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) LIBVLC_USED ); /* iconv wrappers (defined in src/extras/libc.c) */ typedef void *vlc_iconv_t; @@ -815,39 +842,51 @@ VLC_EXPORT( size_t, vlc_iconv, ( vlc_iconv_t, const char **, size_t *, char **, VLC_EXPORT( int, vlc_iconv_close, ( vlc_iconv_t ) ); /* 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) +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) /* dir wrappers (defined in src/extras/libc.c) */ VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir )); -/***************************************************************************** - * 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_tdestroy, ( void *, void (*)(void *) ) ); + +/* Fast large memory copy and memory set */ VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) ); VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); /***************************************************************************** * I18n stuff *****************************************************************************/ -VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) LIBVLC_USED ); +VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) LIBVLC_FORMAT_ARG(1) ); + +#define vlc_pgettext( ctx, id ) \ + vlc_pgettext_aux( ctx "\004" id, id ) + +LIBVLC_FORMAT_ARG(2) +static inline const char *vlc_pgettext_aux( const char *ctx, const char *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; +} /***************************************************************************** * libvlc features @@ -855,17 +894,14 @@ VLC_EXPORT( char *, vlc_gettext, ( const char *msgid ) LIBVLC_USED ); 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_EXPORT( const char *, VLC_Changeset, ( void ) LIBVLC_USED ); /***************************************************************************** * Additional vlc stuff *****************************************************************************/ #include "vlc_messages.h" -#include "vlc_variables.h" #include "vlc_objects.h" +#include "vlc_variables.h" #include "vlc_modules.h" #include "vlc_main.h" #include "vlc_configuration.h"