X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_common.h;h=9a5617c8c8252b25a229fd9344b48f5671781d05;hb=ec87e89b5950679bb48b714ebffd2ae7040b999b;hp=d8dd5807a06619639439ea612f9466f2b156077e;hpb=95a993e5f486beda44c05e5fabf72a2c4bfb3bee;p=vlc diff --git a/include/vlc_common.h b/include/vlc_common.h index d8dd5807a0..9a5617c8c8 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -56,9 +56,29 @@ # 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)) @@ -136,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 @@ -192,6 +212,7 @@ typedef struct config_category_t config_category_t; 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; @@ -226,19 +247,16 @@ 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; @@ -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 /**@}*/ /***************************************************************************** @@ -499,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 *****************************************************************************/ @@ -516,13 +539,9 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ 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 */ \ \ @@ -531,17 +550,23 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ /**@}*/ \ /* 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; @@ -597,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) @@ -785,6 +833,8 @@ static inline uint64_t ntoh64 (uint64_t ll) VLC_EXPORT( bool, vlc_ureduce, ( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ); +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; VLC_EXPORT( vlc_iconv_t, vlc_iconv_open, ( const char *, const char * ) LIBVLC_USED ); @@ -792,12 +842,14 @@ 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 )); +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 ) ); @@ -807,10 +859,13 @@ VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); *****************************************************************************/ 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( const char *ctx, const char *id ) +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; } @@ -839,15 +894,14 @@ static inline void *xrealloc (void *ptr, size_t len) 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 ); /***************************************************************************** * 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"