X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fclone.c;h=1cbfb4790d08501535c43c2c9274c0deca485b41;hb=17365ad04c4fecd14bc904bd1e664a0d88159f91;hp=98048b6372811f092412df2337ad631550223e22;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 98048b6372..1cbfb4790d 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -24,10 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include "filter_common.h" @@ -60,20 +63,26 @@ static int SendEvents( vlc_object_t *, char const *, #define VOUTLIST_LONGTEXT N_("You can use specific video output modules " \ "for the clones. Use a comma-separated list of modules." ) +#define CFG_PREFIX "clone-" + vlc_module_begin(); - set_description( _("Clone video filter") ); + set_description( N_("Clone video filter") ); set_capability( "video filter", 0 ); - set_shortname( _("Clone" )); + set_shortname( N_("Clone" )); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VFILTER ); - add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE ); - add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE ); + add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, false ); + add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true ); add_shortcut( "clone" ); set_callbacks( Create, Destroy ); vlc_module_end(); +static const char *const ppsz_filter_options[] = { + "count", "vout-list", NULL +}; + /***************************************************************************** * vout_sys_t: Clone video output method descriptor ***************************************************************************** @@ -130,7 +139,11 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_display = NULL; p_vout->pf_control = Control; - psz_clonelist = config_GetPsz( p_vout, "clone-vout-list" ); + config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options, + p_vout->p_cfg ); + + psz_clonelist = var_CreateGetNonEmptyString( p_vout, + CFG_PREFIX "vout-list" ); if( psz_clonelist ) { int i_dummy; @@ -178,7 +191,8 @@ static int Create( vlc_object_t *p_this ) { /* No list was specified. We will use the default vout, and get * the number of clones from clone-count */ - p_vout->p_sys->i_clones = config_GetInt( p_vout, "clone-count" ); + p_vout->p_sys->i_clones = + var_CreateGetInteger( p_vout, CFG_PREFIX "count" ); p_vout->p_sys->ppsz_vout_list = NULL; } @@ -206,9 +220,10 @@ static int Init( vout_thread_t *p_vout ) int i_index, i_vout; picture_t *p_pic; char *psz_default_vout; - video_format_t fmt = {0}; + video_format_t fmt; I_OUTPUTPICTURES = 0; + memset( &fmt, 0, sizeof(video_format_t) ); /* Initialize the output structure */ p_vout->output.i_chroma = p_vout->render.i_chroma; @@ -226,7 +241,7 @@ static int Init( vout_thread_t *p_vout ) for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) { - if( p_vout->p_sys->ppsz_vout_list == NULL + if( p_vout->p_sys->ppsz_vout_list == NULL || ( !strncmp( p_vout->p_sys->ppsz_vout_list[i_vout], "default", 8 ) ) ) { @@ -250,7 +265,7 @@ static int Init( vout_thread_t *p_vout ) msg_Err( p_vout, "failed to clone %i vout threads", p_vout->p_sys->i_clones ); p_vout->p_sys->i_clones = i_vout; - if( psz_default_vout ) free( psz_default_vout ); + free( psz_default_vout ); RemoveAllVout( p_vout ); return VLC_EGENERIC; } @@ -258,7 +273,7 @@ static int Init( vout_thread_t *p_vout ) ADD_CALLBACKS( p_vout->p_sys->pp_vout[ i_vout ], SendEvents ); } - if( psz_default_vout ) free( psz_default_vout ); + free( psz_default_vout ); ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); ADD_PARENT_CALLBACKS( SendEventsToChild ); @@ -343,7 +358,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) if( i_in_pitch == i_copy_pitch && i_out_pitch == i_copy_pitch ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch + vlc_memcpy( p_out, p_in, i_in_pitch * p_outpic->p[i_plane].i_visible_lines ); } else @@ -353,7 +368,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch ); + vlc_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; } @@ -376,7 +391,7 @@ static void RemoveAllVout( vout_thread_t *p_vout ) DEL_CALLBACKS( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones], SendEvents ); vlc_object_detach( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] ); - vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] ); + vlc_object_release( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] ); } } @@ -386,6 +401,7 @@ static void RemoveAllVout( vout_thread_t *p_vout ) static int SendEvents( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_this); VLC_UNUSED(oldval); var_Set( (vlc_object_t *)p_data, psz_var, newval ); return VLC_SUCCESS; @@ -397,6 +413,7 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var, static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_data); VLC_UNUSED(oldval); vout_thread_t *p_vout = (vout_thread_t *)p_this; int i_vout;