X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fclone.c;h=33b461cbf55ed033be6653b355fb4c918f922db2;hb=c766d434b0e2f7d8787a30703c06e27e9b2bb8d7;hp=fefc8f83945ee7f3b305564057cdc8aea62bf899;hpb=5e15258c9ef28558fe2abc941fc1527e02b04c21;p=vlc diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index fefc8f8394..33b461cbf5 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -1,7 +1,7 @@ /***************************************************************************** * clone.c : Clone video plugin for vlc ***************************************************************************** - * Copyright (C) 2002, 2003 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -29,28 +29,9 @@ # include "config.h" #endif -#include +#include #include -#include - -#include "filter_common.h" - -#define VOUTSEPARATOR ',' - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Create ( vlc_object_t * ); -static void Destroy ( vlc_object_t * ); - -static int Init ( vout_thread_t * ); -static void End ( vout_thread_t * ); -static void Render ( vout_thread_t *, picture_t * ); - -static void RemoveAllVout ( vout_thread_t *p_vout ); - -static int SendEvents( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +#include /***************************************************************************** * Module descriptor @@ -63,126 +44,81 @@ 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 CLONE_HELP N_("Duplicate your video to multiple windows " \ + "and/or video output modules") #define CFG_PREFIX "clone-" -vlc_module_begin(); - set_description( N_("Clone video filter") ); - set_capability( "video filter", 0 ); - set_shortname( N_("Clone" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); - 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 ); +vlc_module_begin () + set_description( N_("Clone video filter") ) + set_capability( "video splitter", 0 ) + set_shortname( N_("Clone" )) + set_help(CLONE_HELP) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) - add_shortcut( "clone" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + 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 ) -static const char *const ppsz_filter_options[] = { - "count", "vout-list", NULL -}; + add_shortcut( "clone" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** - * vout_sys_t: Clone video output method descriptor - ***************************************************************************** - * This structure is part of the video output thread descriptor. - * It describes the Clone specific properties of an output thread. + * Local prototypes *****************************************************************************/ -struct vout_sys_t -{ - int i_clones; - - /* list of vout modules to use. "default" will launch a default - * module. If specified, overrides the setting in i_clones (which it - * sets to the list length) */ - char **ppsz_vout_list; - - vout_thread_t **pp_vout; +static const char *const ppsz_filter_options[] = { + "count", "vout-list", NULL }; -/***************************************************************************** - * Control: control facility for the vout (forwards to child vout) - *****************************************************************************/ -static int Control( vout_thread_t *p_vout, int i_query, va_list args ) -{ - int i_vout; - for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) - { - vout_vaControl( p_vout->p_sys->pp_vout[ i_vout ], i_query, args ); - } - return VLC_SUCCESS; -} +#define VOUTSEPARATOR ',' -/***************************************************************************** - * Create: allocates Clone video thread output method - ***************************************************************************** - * This function allocates and initializes a Clone vout method. - *****************************************************************************/ -static int Create( vlc_object_t *p_this ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - char *psz_clonelist; +static int Filter( video_splitter_t *, picture_t *pp_dst[], picture_t * ); - /* Allocate structure */ - p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); - if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); - return VLC_ENOMEM; - } - - p_vout->pf_init = Init; - p_vout->pf_end = End; - p_vout->pf_manage = NULL; - p_vout->pf_render = Render; - p_vout->pf_display = NULL; - p_vout->pf_control = Control; +/** + * This function allocates and initializes a Clone splitter module + */ +static int Open( vlc_object_t *p_this ) +{ + video_splitter_t *p_splitter = (video_splitter_t*)p_this; - config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options, - p_vout->p_cfg ); + config_ChainParse( p_splitter, CFG_PREFIX, ppsz_filter_options, + p_splitter->p_cfg ); - psz_clonelist = var_CreateGetNonEmptyString( p_vout, - CFG_PREFIX "vout-list" ); + char *psz_clonelist = var_CreateGetNonEmptyString( p_splitter, + CFG_PREFIX "vout-list" ); if( psz_clonelist ) { - int i_dummy; - char *psz_token; - /* Count the number of defined vout */ - p_vout->p_sys->i_clones = 1; - i_dummy = 0; - while( psz_clonelist[i_dummy] != 0 ) + p_splitter->i_output = 1; + for( int i = 0; psz_clonelist[i]; i++ ) { - if( psz_clonelist[i_dummy] == VOUTSEPARATOR ) - p_vout->p_sys->i_clones++; - i_dummy++; + if( psz_clonelist[i] == VOUTSEPARATOR ) + p_splitter->i_output++; } - p_vout->p_sys->ppsz_vout_list = malloc( p_vout->p_sys->i_clones - * sizeof(char *) ); - if( !p_vout->p_sys->ppsz_vout_list ) + /* */ + p_splitter->p_output = calloc( p_splitter->i_output, + sizeof(*p_splitter->p_output) ); + if( !p_splitter->p_output ) { - msg_Err( p_vout, "out of memory" ); - free( p_vout->p_sys ); - return VLC_ENOMEM; + free( psz_clonelist ); + return VLC_EGENERIC; } /* Tokenize the list */ - i_dummy = 0; - psz_token = psz_clonelist; - while( psz_token && *psz_token ) + char *psz_tmp = psz_clonelist; + for( int i = 0; psz_tmp && *psz_tmp; i++ ) { - char *psz_module; - psz_module = psz_token; - psz_token = strchr( psz_module, VOUTSEPARATOR ); - if( psz_token ) - { - *psz_token = '\0'; - psz_token++; - } - p_vout->p_sys->ppsz_vout_list[i_dummy] = strdup( psz_module ); - i_dummy++; + char *psz_new = strchr( psz_tmp, VOUTSEPARATOR ); + if( psz_new ) + *psz_new++ = '\0'; + + p_splitter->p_output[i].psz_module = strdup( psz_tmp ); + + psz_tmp = psz_new; } free( psz_clonelist ); @@ -191,238 +127,72 @@ 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 = - var_CreateGetInteger( p_vout, CFG_PREFIX "count" ); - p_vout->p_sys->ppsz_vout_list = NULL; - } - - p_vout->p_sys->i_clones = __MAX( 1, __MIN( 99, p_vout->p_sys->i_clones ) ); - - msg_Dbg( p_vout, "spawning %i clone(s)", p_vout->p_sys->i_clones ); - - p_vout->p_sys->pp_vout = malloc( p_vout->p_sys->i_clones * - sizeof(vout_thread_t *) ); - if( p_vout->p_sys->pp_vout == NULL ) - { - msg_Err( p_vout, "out of memory" ); - free( p_vout->p_sys ); - return VLC_ENOMEM; - } - - return VLC_SUCCESS; -} - -/***************************************************************************** - * Init: initialize Clone video thread output method - *****************************************************************************/ -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; + p_splitter->i_output = var_CreateGetInteger( p_splitter, CFG_PREFIX "count" ); + if( p_splitter->i_output <= 0 ) + p_splitter->i_output = 1; - I_OUTPUTPICTURES = 0; - memset( &fmt, 0, sizeof(video_format_t) ); + p_splitter->p_output = calloc( p_splitter->i_output, + sizeof(*p_splitter->p_output) ); - /* Initialize the output structure */ - p_vout->output.i_chroma = p_vout->render.i_chroma; - p_vout->output.i_width = p_vout->render.i_width; - p_vout->output.i_height = p_vout->render.i_height; - p_vout->output.i_aspect = p_vout->render.i_aspect; - p_vout->fmt_out = p_vout->fmt_in; - fmt = p_vout->fmt_out; - - /* Try to open the real video output */ - msg_Dbg( p_vout, "spawning the real video outputs" ); - - /* Save the default vout */ - psz_default_vout = config_GetPsz( p_vout, "vout" ); - - for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) - { - if( p_vout->p_sys->ppsz_vout_list == NULL - || ( !strncmp( p_vout->p_sys->ppsz_vout_list[i_vout], - "default", 8 ) ) ) - { - p_vout->p_sys->pp_vout[i_vout] = - vout_Create( p_vout, &fmt ); - } - else - { - /* create the appropriate vout instead of the default one */ - config_PutPsz( p_vout, "vout", - p_vout->p_sys->ppsz_vout_list[i_vout] ); - p_vout->p_sys->pp_vout[i_vout] = - vout_Create( p_vout, &fmt ); - - /* Reset the default value */ - config_PutPsz( p_vout, "vout", psz_default_vout ); - } - - if( p_vout->p_sys->pp_vout[ i_vout ] == NULL ) - { - msg_Err( p_vout, "failed to clone %i vout threads", - p_vout->p_sys->i_clones ); - p_vout->p_sys->i_clones = i_vout; - free( psz_default_vout ); - RemoveAllVout( p_vout ); + if( !p_splitter->p_output ) return VLC_EGENERIC; - } - ADD_CALLBACKS( p_vout->p_sys->pp_vout[ i_vout ], SendEvents ); + for( int i = 0; i < p_splitter->i_output; i++ ) + p_splitter->p_output[i].psz_module = NULL; } - free( psz_default_vout ); - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - - ADD_PARENT_CALLBACKS( SendEventsToChild ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * End: terminate Clone video thread output method - *****************************************************************************/ -static void End( vout_thread_t *p_vout ) -{ - int i_index; - - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) + /* */ + for( int i = 0; i < p_splitter->i_output; i++ ) { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); + video_splitter_output_t *p_cfg = &p_splitter->p_output[i]; + video_format_Copy( &p_cfg->fmt, &p_splitter->fmt ); + p_cfg->window.i_x = 0; + p_cfg->window.i_y = 0; + p_cfg->window.i_align = 0; } -} - -/***************************************************************************** - * Destroy: destroy Clone video thread output method - ***************************************************************************** - * Terminate an output method created by CloneCreateOutputMethod - *****************************************************************************/ -static void Destroy( vlc_object_t *p_this ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - RemoveAllVout( p_vout ); + /* */ + p_splitter->pf_filter = Filter; + p_splitter->pf_mouse = NULL; - DEL_PARENT_CALLBACKS( SendEventsToChild ); + msg_Dbg( p_splitter, "spawning %i clone(s)", p_splitter->i_output ); - free( p_vout->p_sys->pp_vout ); - free( p_vout->p_sys ); + return VLC_SUCCESS; } -/***************************************************************************** - * Render: displays previously rendered output - ***************************************************************************** - * This function send the currently rendered image to Clone image, waits - * until it is displayed and switch the two rendering buffers, preparing next - * frame. - *****************************************************************************/ -static void Render( vout_thread_t *p_vout, picture_t *p_pic ) +/** + * This function closes a clone video splitter module + */ +static void Close( vlc_object_t *p_this ) { - picture_t *p_outpic = NULL; - int i_vout, i_plane; + video_splitter_t *p_splitter = (video_splitter_t*)p_this; - for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) + for( int i = 0; i < p_splitter->i_output; i++ ) { - while( ( p_outpic = - vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 ) - ) == NULL ) - { - if( p_vout->b_die || p_vout->b_error ) - { - vout_DestroyPicture( - p_vout->p_sys->pp_vout[ i_vout ], p_outpic ); - return; - } - - msleep( VOUT_OUTMEM_SLEEP ); - } - - vout_DatePicture( p_vout->p_sys->pp_vout[ i_vout ], - p_outpic, p_pic->date ); - vout_LinkPicture( p_vout->p_sys->pp_vout[ i_vout ], p_outpic ); + video_splitter_output_t *p_cfg = &p_splitter->p_output[i]; - for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) - { - uint8_t *p_in, *p_in_end, *p_out; - int i_in_pitch = p_pic->p[i_plane].i_pitch; - const int i_out_pitch = p_outpic->p[i_plane].i_pitch; - const int i_copy_pitch = p_outpic->p[i_plane].i_visible_pitch; - - p_in = p_pic->p[i_plane].p_pixels; - p_out = p_outpic->p[i_plane].p_pixels; - - if( i_in_pitch == i_copy_pitch - && i_out_pitch == i_copy_pitch ) - { - vlc_memcpy( p_out, p_in, i_in_pitch - * p_outpic->p[i_plane].i_visible_lines ); - } - else - { - p_in_end = p_in + i_in_pitch * - p_outpic->p[i_plane].i_visible_lines; - - while( p_in < p_in_end ) - { - vlc_memcpy( p_out, p_in, i_copy_pitch ); - p_in += i_in_pitch; - p_out += i_out_pitch; - } - } - } - - vout_UnlinkPicture( p_vout->p_sys->pp_vout[ i_vout ], p_outpic ); - vout_DisplayPicture( p_vout->p_sys->pp_vout[ i_vout ], p_outpic ); + free( p_cfg->psz_module ); + video_format_Clean( &p_cfg->fmt ); } + free( p_splitter->p_output ); } -/***************************************************************************** - * RemoveAllVout: destroy all the child video output threads - *****************************************************************************/ -static void RemoveAllVout( vout_thread_t *p_vout ) +/** + * This function filter a picture + */ +static int Filter( video_splitter_t *p_splitter, + picture_t *pp_dst[], picture_t *p_src ) { - while( p_vout->p_sys->i_clones ) + if( video_splitter_NewPicture( p_splitter, pp_dst ) ) { - --p_vout->p_sys->i_clones; - 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] ); + picture_Release( p_src ); + return VLC_EGENERIC; } -} -/***************************************************************************** - * SendEvents: forward mouse and keyboard events to the parent 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 ); + for( int i = 0; i < p_splitter->i_output; i++ ) + picture_Copy( pp_dst[i], p_src ); + picture_Release( p_src ); return VLC_SUCCESS; } -/***************************************************************************** - * SendEventsToChild: forward events to the child/children vout - *****************************************************************************/ -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; - - for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) - { - var_Set( p_vout->p_sys->pp_vout[ i_vout ], psz_var, newval ); - - if( !strcmp( psz_var, "fullscreen" ) ) break; - } - - return VLC_SUCCESS; -}