X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmodules.h;h=93d084ae92cc08399594a93008aa20ae271e1620;hb=a90a19a6b0468ea9fedadc27cfc1118d70295263;hp=dec013a58a0d3ab4b4af2af44f32d59f35107c0f;hpb=cecb7e869db3e9cecffcb712fd66c3a8bc52636e;p=vlc diff --git a/include/modules.h b/include/modules.h index dec013a58a..93d084ae92 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,7 +2,7 @@ * modules.h : Module management functions. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules.h,v 1.55 2002/06/11 09:44:21 gbazin Exp $ + * $Id$ * * Authors: Samuel Hocevar * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -27,100 +27,84 @@ /* Number of tries before we unload an unused module */ #define MODULE_HIDE_DELAY 50 -#define MODULE_SHORTCUT_MAX 10 +#define MODULE_SHORTCUT_MAX 50 /* The module handle type. */ -#ifdef SYS_BEOS -typedef int module_handle_t; -#else -typedef void * module_handle_t; +#if defined(HAVE_DL_DYLD) +# if defined (HAVE_MACH_O_DYLD_H) +# include +# endif +typedef NSModule module_handle_t; +#elif defined(HAVE_IMAGE_H) +typedef int module_handle_t; +#elif defined(WIN32) || defined(UNDER_CE) +typedef void * module_handle_t; +#elif defined(HAVE_DL_DLOPEN) +typedef void * module_handle_t; +#elif defined(HAVE_DL_SHL_LOAD) +typedef shl_t module_handle_t; #endif -/***************************************************************************** - * Module capabilities. - *****************************************************************************/ -#define MODULE_CAPABILITY_MAIN 0 /* Main */ -#define MODULE_CAPABILITY_INTF 1 /* Interface */ -#define MODULE_CAPABILITY_ACCESS 2 /* Input */ -#define MODULE_CAPABILITY_DEMUX 3 /* Input */ -#define MODULE_CAPABILITY_NETWORK 4 /* Network */ -#define MODULE_CAPABILITY_DECODER 5 /* Audio or video decoder */ -#define MODULE_CAPABILITY_MOTION 6 /* Motion compensation */ -#define MODULE_CAPABILITY_IDCT 7 /* IDCT transformation */ -#define MODULE_CAPABILITY_AOUT 8 /* Audio output */ -#define MODULE_CAPABILITY_AOUT_FILTER 9 /* Audio output filter */ -#define MODULE_CAPABILITY_VOUT 10 /* Video output */ -#define MODULE_CAPABILITY_VOUT_FILTER 11 /* Video output filter */ -#define MODULE_CAPABILITY_CHROMA 12 /* colorspace conversion */ -#define MODULE_CAPABILITY_IMDCT 13 /* IMDCT transformation */ -#define MODULE_CAPABILITY_DOWNMIX 14 /* AC3 downmix */ -#define MODULE_CAPABILITY_MEMCPY 15 /* memcpy */ -#define MODULE_CAPABILITY_MAX 16 /* Total number of capabilities */ - -#define DECLARE_MODULE_CAPABILITY_TABLE \ - static const char *ppsz_capabilities[] = \ - { \ - "main", \ - "interface", \ - "access", \ - "demux", \ - "network", \ - "decoder", \ - "motion", \ - "iDCT", \ - "audio output", \ - "audio output filter", \ - "video output", \ - "video output filter", \ - "chroma transformation", \ - "iMDCT", \ - "downmix", \ - "memcpy", \ - "unknown" \ - } - -#define MODULE_CAPABILITY( i_capa ) \ - ppsz_capabilities[ ((i_capa) > MODULE_CAPABILITY_MAX) ? \ - MODULE_CAPABILITY_MAX : (i_capa) ] - /***************************************************************************** * module_bank_t: the module bank ***************************************************************************** * This variable is accessed by any function using modules. *****************************************************************************/ -struct module_bank_s +struct module_bank_t { - module_t * first; /* First module in the bank */ - int i_count; /* Number of allocated modules */ + VLC_COMMON_MEMBERS + + int i_usage; + module_symbols_t symbols; + + vlc_bool_t b_main; + vlc_bool_t b_builtins; + vlc_bool_t b_plugins; + + /* Plugins cache */ + vlc_bool_t b_cache; + vlc_bool_t b_cache_dirty; + vlc_bool_t b_cache_delete; - vlc_mutex_t lock; /* Global lock -- you can't imagine how awful * - it is to design thread-safe linked lists */ + int i_cache; + module_cache_t **pp_cache; + + int i_loaded_cache; + module_cache_t **pp_loaded_cache; }; /***************************************************************************** * Module description structure *****************************************************************************/ -struct module_s +struct module_t { VLC_COMMON_MEMBERS /* * Variables set by the module to identify itself */ + char *psz_shortname; /* Module name */ + char *psz_name; /* Human-readable shortname */ char *psz_longname; /* Module descriptive name */ /* * Variables set by the module to tell us what it can do */ char *psz_program; /* Program name which will activate the module */ + char *pp_shortcuts[ MODULE_SHORTCUT_MAX ]; /* Shortcuts to the module */ - u32 i_capabilities; /* Capability list */ - int pi_score[ MODULE_CAPABILITY_MAX ]; /* Score for each capability */ + char *psz_capability; /* Capability */ + int i_score; /* Score for each capability */ + uint32_t i_cpu; /* Required CPU capabilities */ - u32 i_cpu_capabilities; /* Required CPU capabilities */ + vlc_bool_t b_unloadable; /* Can we be dlclosed? */ + vlc_bool_t b_reentrant; /* Are we reentrant? */ + vlc_bool_t b_submodule; /* Is this a submodule? */ - module_functions_t *p_functions; /* Capability functions */ + /* Callbacks */ + int ( * pf_activate ) ( vlc_object_t * ); + void ( * pf_deactivate ) ( vlc_object_t * ); /* * Variables set by the module to store its config options @@ -132,30 +116,12 @@ struct module_s /* * Variables used internally by the module manager */ - vlc_bool_t b_builtin; /* Set to true if the module is built in */ - - union - { - struct - { - module_handle_t handle; /* Unique handle */ - char * psz_filename; /* Module filename */ - - } plugin; - - struct - { - int ( *pf_deactivate ) ( module_t * ); - - } builtin; - - } is; - - int i_usage; /* Reference counter */ - int i_unused_delay; /* Delay until module is unloaded */ + /* Plugin-specific stuff */ + module_handle_t handle; /* Unique handle */ + char * psz_filename; /* Module filename */ - module_t *next; /* Next module */ - module_t *prev; /* Previous module */ + vlc_bool_t b_builtin; /* Set to true if the module is built in */ + vlc_bool_t b_loaded; /* Set to true if the dll is loaded */ /* * Symbol table we send to the module so that it can access vlc symbols @@ -164,177 +130,38 @@ struct module_s }; /***************************************************************************** - * Module functions description structure + * Module cache description structure *****************************************************************************/ -typedef struct function_list_s -{ - union - { - /* Interface plugin */ - struct - { - int ( * pf_open ) ( intf_thread_t * ); - void ( * pf_close )( intf_thread_t * ); - void ( * pf_run ) ( intf_thread_t * ); - } intf; - - /* Access plugin */ - struct - { - int ( * pf_open ) ( input_thread_t * ); - void ( * pf_close ) ( input_thread_t * ); - ssize_t ( * pf_read ) ( input_thread_t *, byte_t *, size_t ); - void ( * pf_seek ) ( input_thread_t *, off_t ); - int ( * pf_set_program ) ( input_thread_t *, pgrm_descriptor_t * ); - int ( * pf_set_area ) ( input_thread_t *, input_area_t * ); - } access; - - /* Demux plugin */ - struct - { - int ( * pf_init ) ( input_thread_t * ); - void ( * pf_end ) ( input_thread_t * ); - int ( * pf_demux ) ( input_thread_t * ); - int ( * pf_rewind ) ( input_thread_t * ); - } demux; - - /* Network plugin */ - struct - { - int ( * pf_open ) ( vlc_object_t *, network_socket_t * ); - } network; - - /* Audio output plugin */ - struct - { - int ( * pf_open ) ( aout_thread_t * ); - int ( * pf_setformat ) ( aout_thread_t * ); - int ( * pf_getbufinfo ) ( aout_thread_t *, int ); - void ( * pf_play ) ( aout_thread_t *, byte_t *, int ); - void ( * pf_close ) ( aout_thread_t * ); - } aout; - - /* Video output plugin */ - struct - { - int ( * pf_create ) ( vout_thread_t * ); - int ( * pf_init ) ( vout_thread_t * ); - void ( * pf_end ) ( vout_thread_t * ); - void ( * pf_destroy ) ( vout_thread_t * ); - int ( * pf_manage ) ( vout_thread_t * ); - void ( * pf_render ) ( vout_thread_t *, picture_t * ); - void ( * pf_display ) ( vout_thread_t *, picture_t * ); - } vout; - - /* Motion compensation plugin */ - struct - { - void ( * ppppf_motion[2][2][4] ) ( yuv_data_t *, yuv_data_t *, - int, int ); - } motion; - - /* IDCT plugin */ - struct - { - void ( * pf_idct_init ) ( void ** ); - void ( * pf_sparse_idct_add )( dctelem_t *, yuv_data_t *, int, - void *, int ); - void ( * pf_idct_add ) ( dctelem_t *, yuv_data_t *, int, - void *, int ); - void ( * pf_sparse_idct_copy )( dctelem_t *, yuv_data_t *, int, - void *, int ); - void ( * pf_idct_copy ) ( dctelem_t *, yuv_data_t *, int, - void *, int ); - void ( * pf_norm_scan ) ( u8 ppi_scan[2][64] ); - } idct; - - /* Chroma transformation plugin */ - struct - { - int ( * pf_init ) ( vout_thread_t * ); - void ( * pf_end ) ( vout_thread_t * ); - } chroma; - - /* IMDCT plugin */ - struct - { - void ( * pf_imdct_init ) ( imdct_t * ); - void ( * pf_imdct_256 ) ( imdct_t *, float [], float [] ); - void ( * pf_imdct_256_nol )( imdct_t *, float [], float [] ); - void ( * pf_imdct_512 ) ( imdct_t *, float [], float [] ); - void ( * pf_imdct_512_nol )( imdct_t *, float [], float [] ); -// void ( * pf_fft_64p ) ( complex_t * ); - - } imdct; - - /* AC3 downmix plugin */ - struct - { - void ( * pf_downmix_3f_2r_to_2ch ) ( float *, dm_par_t * ); - void ( * pf_downmix_3f_1r_to_2ch ) ( float *, dm_par_t * ); - void ( * pf_downmix_2f_2r_to_2ch ) ( float *, dm_par_t * ); - void ( * pf_downmix_2f_1r_to_2ch ) ( float *, dm_par_t * ); - void ( * pf_downmix_3f_0r_to_2ch ) ( float *, dm_par_t * ); - void ( * pf_stream_sample_2ch_to_s16 ) ( s16 *, float *, float * ); - void ( * pf_stream_sample_1ch_to_s16 ) ( s16 *, float * ); - - } downmix; - - /* Decoder plugins */ - struct - { - int ( * pf_probe)( u8 * p_es ); - int ( * pf_run ) ( decoder_fifo_t * p_fifo ); - } dec; - - /* memcpy plugins */ - struct - { - void* ( * pf_memcpy ) ( void *, const void *, size_t ); - void* ( * pf_memset ) ( void *, int, size_t ); - } memcpy; - - } functions; - -} function_list_t; - -struct module_functions_s +struct module_cache_t { - /* XXX: The order here has to be the same as above for the #defines */ - function_list_t intf; - function_list_t access; - function_list_t demux; - function_list_t network; - function_list_t dec; - function_list_t motion; - function_list_t idct; - function_list_t aout; - function_list_t vout; - function_list_t chroma; - function_list_t imdct; - function_list_t downmix; - function_list_t memcpy; + /* Mandatory cache entry header */ + char *psz_file; + int64_t i_time; + int64_t i_size; + vlc_bool_t b_junk; + + /* Optional extra data */ + module_t *p_module; }; /***************************************************************************** * Exported functions. *****************************************************************************/ -#define module_InitBank(a) __module_InitBank(CAST_TO_VLC_OBJECT(a)) +#define module_InitBank(a) __module_InitBank(VLC_OBJECT(a)) void __module_InitBank ( vlc_object_t * ); -#define module_LoadMain(a) __module_LoadMain(CAST_TO_VLC_OBJECT(a)) +#define module_LoadMain(a) __module_LoadMain(VLC_OBJECT(a)) void __module_LoadMain ( vlc_object_t * ); -#define module_LoadBuiltins(a) __module_LoadBuiltins(CAST_TO_VLC_OBJECT(a)) +#define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a)) void __module_LoadBuiltins ( vlc_object_t * ); -#define module_LoadPlugins(a) __module_LoadPlugins(CAST_TO_VLC_OBJECT(a)) +#define module_LoadPlugins(a) __module_LoadPlugins(VLC_OBJECT(a)) void __module_LoadPlugins ( vlc_object_t * ); -#define module_EndBank(a) __module_EndBank(CAST_TO_VLC_OBJECT(a)) +#define module_EndBank(a) __module_EndBank(VLC_OBJECT(a)) void __module_EndBank ( vlc_object_t * ); -#define module_ResetBank(a) __module_ResetBank(CAST_TO_VLC_OBJECT(a)) +#define module_ResetBank(a) __module_ResetBank(VLC_OBJECT(a)) void __module_ResetBank ( vlc_object_t * ); -#define module_ManageBank(a) __module_ManageBank(CAST_TO_VLC_OBJECT(a)) -void __module_ManageBank ( vlc_object_t * ); -#define module_Need(a,b,c,d) __module_Need(CAST_TO_VLC_OBJECT(a),b,c,d) -VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, int, char *, void * ) ); -VLC_EXPORT( void, module_Unneed, ( module_t * ) ); +#define module_Need(a,b,c,d) __module_Need(VLC_OBJECT(a),b,c,d) +VLC_EXPORT( module_t *, __module_Need, ( vlc_object_t *, const char *, const char *, vlc_bool_t ) ); +#define module_Unneed(a,b) __module_Unneed(VLC_OBJECT(a),b) +VLC_EXPORT( void, __module_Unneed, ( vlc_object_t *, module_t * ) );