X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fclone.c;h=4653563024b22e693a08f8166fb17f9b4855e601;hb=be378fbc80c384e2541517d6853b59411b7e67de;hp=1e0bf351e6cb164837fb3771aa549d32278822ce;hpb=a1e813777408263806ec177c14eedcfe871d6160;p=vlc diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 1e0bf351e6..4653563024 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -1,8 +1,8 @@ /***************************************************************************** * clone.c : Clone video plugin for vlc ***************************************************************************** - * Copyright (C) 2002, 2003 VideoLAN - * $Id: clone.c,v 1.9 2003/03/30 18:14:38 gbazin Exp $ + * Copyright (C) 2002, 2003 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -18,17 +18,20 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include #include "filter_common.h" @@ -52,23 +55,34 @@ static int SendEvents( vlc_object_t *, char const *, /***************************************************************************** * Module descriptor *****************************************************************************/ -#define COUNT_TEXT N_("number of clones") -#define COUNT_LONGTEXT N_("Select the number of video windows in which to "\ - "clone the video") +#define COUNT_TEXT N_("Number of clones") +#define COUNT_LONGTEXT N_("Number of video windows in which to "\ + "clone the video.") + +#define VOUTLIST_TEXT N_("Video output modules") +#define VOUTLIST_LONGTEXT N_("You can use specific video output modules " \ + "for the clones. Use a comma-separated list of modules." ) -#define VOUTLIST_TEXT N_("list of vout modules") -#define VOUTLIST_LONGTEXT N_("Select the specific vout modules that you want to activate") +#define CFG_PREFIX "clone-" vlc_module_begin(); - add_category_hint( N_("Clone"), NULL, VLC_FALSE ); - add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE ); - add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_FALSE ); - set_description( _("clone video filter") ); + set_description( N_("Clone video filter") ); set_capability( "video filter", 0 ); + set_shortname( N_("Clone" )); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); + + 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 ***************************************************************************** @@ -87,6 +101,19 @@ struct vout_sys_t vout_thread_t **pp_vout; }; +/***************************************************************************** + * 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; +} + /***************************************************************************** * Create: allocates Clone video thread output method ***************************************************************************** @@ -100,18 +127,20 @@ static int Create( vlc_object_t *p_this ) /* 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; - 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; @@ -131,7 +160,7 @@ static int Create( vlc_object_t *p_this ) * sizeof(char *) ); if( !p_vout->p_sys->ppsz_vout_list ) { - msg_Err( p_vout, "out of memory" ); + free( psz_clonelist ); free( p_vout->p_sys ); return VLC_ENOMEM; } @@ -159,7 +188,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; } @@ -187,14 +217,18 @@ 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; I_OUTPUTPICTURES = 0; + memset( &fmt, 0, sizeof(video_format_t) ); /* 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" ); @@ -204,14 +238,12 @@ 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 ) ) ) { p_vout->p_sys->pp_vout[i_vout] = - vout_Create( p_vout, p_vout->render.i_width, - p_vout->render.i_height, p_vout->render.i_chroma, - p_vout->render.i_aspect ); + vout_Create( p_vout, &fmt ); } else { @@ -219,9 +251,7 @@ static int Init( vout_thread_t *p_vout ) 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, p_vout->render.i_width, - p_vout->render.i_height, p_vout->render.i_chroma, - p_vout->render.i_aspect ); + vout_Create( p_vout, &fmt ); /* Reset the default value */ config_PutPsz( p_vout, "vout", psz_default_vout ); @@ -232,7 +262,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; } @@ -240,9 +270,11 @@ 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 ); + return VLC_SUCCESS; } @@ -253,12 +285,16 @@ static void End( vout_thread_t *p_vout ) { int i_index; + DEL_PARENT_CALLBACKS( SendEventsToChild ); + /* Free the fake output buffers we allocated */ for( i_index = I_OUTPUTPICTURES ; i_index ; ) { i_index--; free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); } + + RemoveAllVout( p_vout ); } /***************************************************************************** @@ -270,8 +306,6 @@ static void Destroy( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; - RemoveAllVout( p_vout ); - free( p_vout->p_sys->pp_vout ); free( p_vout->p_sys ); } @@ -294,7 +328,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 ) ) == NULL ) { - if( p_vout->b_die || p_vout->b_error ) + if( !vlc_object_alive (p_vout) || p_vout->b_error ) { vout_DestroyPicture( p_vout->p_sys->pp_vout[ i_vout ], p_outpic ); @@ -321,16 +355,17 @@ 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_vlc->pf_memcpy( p_out, p_in, i_in_pitch - * p_outpic->p[i_plane].i_lines ); + 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_lines; + p_in_end = p_in + i_in_pitch * + p_outpic->p[i_plane].i_visible_lines; while( p_in < p_in_end ) { - p_vout->p_vlc->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; } @@ -352,8 +387,7 @@ static void RemoveAllVout( vout_thread_t *p_vout ) --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] ); + vout_CloseAndRelease( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] ); } } @@ -363,7 +397,28 @@ 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; } + +/***************************************************************************** + * 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; +}