X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Fclone.c;h=ad7360395e1ae9a362074b586350fde407ecb155;hb=5ea1694ee914b958e720f00a2af2d7b2a5c2d59d;hp=58dcd737024fbfd16a459a2f7cb383b2848561f9;hpb=e2da42f9737f1197cd7e8d768266b5e0c6ec87e7;p=vlc diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 58dcd73702..ad7360395e 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 VideoLAN - * $Id: clone.c,v 1.3 2002/11/28 17:35:00 sam Exp $ + * Copyright (C) 2002-2009 the VideoLAN team + * $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 @@ -18,238 +18,182 @@ * * 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 "filter_common.h" - -/***************************************************************************** - * 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 ); +#include +#include +#include /***************************************************************************** * 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") - -vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT ); - set_description( _("image clone video module") ); - set_capability( "video filter", 0 ); - add_shortcut( "clone" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); +#define COUNT_LONGTEXT N_("Number of video windows in which to "\ + "clone the video.") -/***************************************************************************** - * 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. - *****************************************************************************/ -struct vout_sys_t -{ - int i_clones; - vout_thread_t **pp_vout; -}; +#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." ) -/***************************************************************************** - * 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; +#define CLONE_HELP N_("Duplicate your video to multiple windows " \ + "and/or video output modules") +#define CFG_PREFIX "clone-" - /* 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( 1 ); - } +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); - 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; +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 ) - /* Look what method was requested */ - p_vout->p_sys->i_clones = config_GetInt( p_vout, "clone-count" ); + add_integer( CFG_PREFIX "count", 2, COUNT_TEXT, COUNT_LONGTEXT, false ) + add_module_list( CFG_PREFIX "vout-list", "vout display", NULL, + VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true ) - p_vout->p_sys->i_clones = __MAX( 1, __MIN( 99, p_vout->p_sys->i_clones ) ); + add_shortcut( "clone" ) + set_callbacks( Open, Close ) +vlc_module_end () - msg_Dbg( p_vout, "spawning %i clone(s)", p_vout->p_sys->i_clones ); +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static const char *const ppsz_filter_options[] = { + "count", "vout-list", NULL +}; - 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( 1 ); - } +#define VOUTSEPARATOR ':' - return( 0 ); -} +static int Filter( video_splitter_t *, picture_t *pp_dst[], picture_t * ); -/***************************************************************************** - * Init: initialize Clone video thread output method - *****************************************************************************/ -static int Init( vout_thread_t *p_vout ) +/** + * This function allocates and initializes a Clone splitter module + */ +static int Open( vlc_object_t *p_this ) { - int i_index, i_vout; - picture_t *p_pic; - - I_OUTPUTPICTURES = 0; + video_splitter_t *p_splitter = (video_splitter_t*)p_this; - /* 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; + config_ChainParse( p_splitter, CFG_PREFIX, ppsz_filter_options, + p_splitter->p_cfg ); - /* Try to open the real video output */ - msg_Dbg( p_vout, "spawning the real video outputs" ); - - for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) + char *psz_clonelist = var_CreateGetNonEmptyString( p_splitter, + CFG_PREFIX "vout-list" ); + if( psz_clonelist ) { - 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 ); - if( p_vout->p_sys->pp_vout[ i_vout ] == NULL ) + /* Count the number of defined vout */ + p_splitter->i_output = 1; + for( int i = 0; psz_clonelist[i]; i++ ) { - msg_Err( p_vout, "failed to clone %i vout threads", - p_vout->p_sys->i_clones ); - p_vout->p_sys->i_clones = i_vout; - RemoveAllVout( p_vout ); - return 0; + if( psz_clonelist[i] == VOUTSEPARATOR ) + p_splitter->i_output++; } - } - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); + /* */ + p_splitter->p_output = calloc( p_splitter->i_output, + sizeof(*p_splitter->p_output) ); + if( !p_splitter->p_output ) + { + free( psz_clonelist ); + return VLC_EGENERIC; + } - return( 0 ); -} + /* Tokenize the list */ + char *psz_tmp = psz_clonelist; + for( int i = 0; psz_tmp && *psz_tmp; i++ ) + { + char *psz_new = strchr( psz_tmp, VOUTSEPARATOR ); + if( psz_new ) + *psz_new++ = '\0'; -/***************************************************************************** - * End: terminate Clone video thread output method - *****************************************************************************/ -static void End( vout_thread_t *p_vout ) -{ - int i_index; + p_splitter->p_output[i].psz_module = strdup( psz_tmp ); - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) - { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); - } -} + psz_tmp = psz_new; + } -/***************************************************************************** - * 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; + free( psz_clonelist ); + } + else + { + /* No list was specified. We will use the default vout, and get + * the number of clones from clone-count */ + p_splitter->i_output = var_CreateGetInteger( p_splitter, CFG_PREFIX "count" ); + if( p_splitter->i_output <= 0 ) + p_splitter->i_output = 1; - RemoveAllVout( p_vout ); + p_splitter->p_output = calloc( p_splitter->i_output, + sizeof(*p_splitter->p_output) ); - free( p_vout->p_sys->pp_vout ); - free( p_vout->p_sys ); -} + if( !p_splitter->p_output ) + return VLC_EGENERIC; -/***************************************************************************** - * 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 ) -{ - picture_t *p_outpic = NULL; - int i_vout, i_plane; + for( int i = 0; i < p_splitter->i_output; i++ ) + p_splitter->p_output[i].psz_module = NULL; + } - 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]; + 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; + } - for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) - { - u8 *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; + /* */ + p_splitter->pf_filter = Filter; + p_splitter->pf_mouse = NULL; - p_in = p_pic->p[i_plane].p_pixels; + msg_Dbg( p_splitter, "spawning %i clone(s)", p_splitter->i_output ); - p_in_end = p_in + p_outpic->p[i_plane].i_lines - * p_pic->p[i_plane].i_pitch; + return VLC_SUCCESS; +} - p_out = p_outpic->p[i_plane].p_pixels; +/** + * This function closes a clone video splitter module + */ +static void Close( vlc_object_t *p_this ) +{ + video_splitter_t *p_splitter = (video_splitter_t*)p_this; - while( p_in < p_in_end ) - { - p_vout->p_vlc->pf_memcpy( p_out, p_in, i_out_pitch ); - p_in += i_in_pitch; - p_out += i_out_pitch; - } - } + for( int i = 0; i < p_splitter->i_output; i++ ) + { + video_splitter_output_t *p_cfg = &p_splitter->p_output[i]; - 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; - vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] ); + picture_Release( p_src ); + return VLC_EGENERIC; } + + for( int i = 0; i < p_splitter->i_output; i++ ) + picture_Copy( pp_dst[i], p_src ); + + picture_Release( p_src ); + return VLC_SUCCESS; }