X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fclone.c;h=735933c55d170f8831243d447e4651aa41cc27fe;hb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;hp=5d0b300468a9484f65df0d600cd2c0578a2e6719;hpb=a90a19a6b0468ea9fedadc27cfc1118d70295263;p=vlc diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 5d0b300468..735933c55d 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 VideoLAN + * Copyright (C) 2002, 2003 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -18,17 +18,16 @@ * * 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 +#include #include "filter_common.h" @@ -53,25 +52,33 @@ 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 "\ +#define COUNT_LONGTEXT N_("Number of video windows in which to "\ "clone the video.") -#define VOUTLIST_TEXT N_("List of video output modules") -#define VOUTLIST_LONGTEXT N_("Select the specific video output modules that you want to activate.") +#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 CFG_PREFIX "clone-" vlc_module_begin(); set_description( _("Clone video filter") ); set_capability( "video filter", 0 ); + set_shortname( _("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_FALSE ); - + add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE ); + add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_TRUE ); + add_shortcut( "clone" ); set_callbacks( Create, Destroy ); vlc_module_end(); +static const char *ppsz_filter_options[] = { + "count", "vout-list", NULL +}; + /***************************************************************************** * vout_sys_t: Clone video output method descriptor ***************************************************************************** @@ -128,7 +135,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; @@ -176,7 +187,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; } @@ -204,14 +216,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" ); @@ -221,14 +237,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 { @@ -236,9 +250,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 ); @@ -342,7 +354,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_vlc->pf_memcpy( p_out, p_in, i_in_pitch + p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch * p_outpic->p[i_plane].i_visible_lines ); } else @@ -352,7 +364,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch ); + p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; }