X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fwall.c;h=0e8a8b9709ed46bd45cb343425d0b439ab404e58;hb=79053042f17a929d8fd175cc51d989f1f6abdba9;hp=b05f962164d739a082267f38a608c6058a9fbfac;hpb=19ea8feb6db01c1deafb19f35ecee8eff81aeb02;p=vlc diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index b05f962164..0e8a8b9709 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -1,8 +1,8 @@ /***************************************************************************** * wall.c : Wall video plugin for vlc ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN - * $Id: wall.c,v 1.1 2002/08/04 17:23:43 sam Exp $ + * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN + * $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 @@ -24,7 +24,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #include /* malloc(), free() */ #include @@ -45,28 +44,35 @@ 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 * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ #define COLS_TEXT N_("Number of columns") -#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \ - "which to split the video") +#define COLS_LONGTEXT N_("Select the number of horizontal video windows in " \ + "which to split the video.") #define ROWS_TEXT N_("Number of rows") -#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \ - "which to split the video") +#define ROWS_LONGTEXT N_("Select the number of vertical video windows in " \ + "which to split the video.") #define ACTIVE_TEXT N_("Active windows") -#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \ +#define ACTIVE_LONGTEXT N_("Comma separated list of active windows, " \ "defaults to all") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT ); - add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT ); - add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT ); - set_description( _("image wall video module") ); + set_description( _("wall video filter") ); + set_shortname( N_("Image wall" )); set_capability( "video filter", 0 ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); + + add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); + add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); + add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE ); + add_shortcut( "wall" ); set_callbacks( Create, Destroy ); vlc_module_end(); @@ -91,6 +97,25 @@ struct vout_sys_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_row, i_col, i_vout = 0; + + for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ ) + { + for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ ) + { + vout_vaControl( p_vout->p_sys->pp_vout[ i_vout ].p_vout, + i_query, args ); + i_vout++; + } + } + return VLC_SUCCESS; +} + /***************************************************************************** * Create: allocates Wall video thread output method ***************************************************************************** @@ -107,7 +132,7 @@ static int Create( vlc_object_t *p_this ) if( p_vout->p_sys == NULL ) { msg_Err( p_vout, "out of memory" ); - return( 1 ); + return VLC_ENOMEM; } p_vout->pf_init = Init; @@ -115,6 +140,7 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_manage = NULL; p_vout->pf_render = Render; p_vout->pf_display = NULL; + p_vout->pf_control = Control; /* Look what method was requested */ p_vout->p_sys->i_col = config_GetInt( p_vout, "wall-cols" ); @@ -133,7 +159,7 @@ static int Create( vlc_object_t *p_this ) { msg_Err( p_vout, "out of memory" ); free( p_vout->p_sys ); - return( 1 ); + return VLC_ENOMEM; } psz_method_tmp = psz_method = config_GetPsz( p_vout, "wall-active" ); @@ -186,7 +212,7 @@ static int Create( vlc_object_t *p_this ) free( psz_method_tmp ); - return( 0 ); + return VLC_SUCCESS; } /***************************************************************************** @@ -196,7 +222,7 @@ static int Init( vout_thread_t *p_vout ) { int i_index, i_row, i_col, i_width, i_height; picture_t *p_pic; - + I_OUTPUTPICTURES = 0; /* Initialize the output structure */ @@ -249,18 +275,21 @@ static int Init( vout_thread_t *p_vout ) } p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout = - vout_CreateThread( p_vout, i_width, i_height, - p_vout->render.i_chroma, - p_vout->render.i_aspect - * p_vout->render.i_height / i_height - * i_width / p_vout->render.i_width ); + vout_Create( p_vout, i_width, i_height, + p_vout->render.i_chroma, + p_vout->render.i_aspect + * p_vout->render.i_height / i_height + * i_width / p_vout->render.i_width ); if( p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout == NULL ) { msg_Err( p_vout, "failed to get %ix%i vout threads", p_vout->p_sys->i_col, p_vout->p_sys->i_row ); RemoveAllVout( p_vout ); - return 0; + return VLC_EGENERIC; } + ADD_CALLBACKS( + p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout, + SendEvents ); p_vout->p_sys->i_vout++; } @@ -268,7 +297,9 @@ static int Init( vout_thread_t *p_vout ) ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - return( 0 ); + ADD_PARENT_CALLBACKS( SendEventsToChild ); + + return VLC_SUCCESS; } /***************************************************************************** @@ -297,6 +328,8 @@ static void Destroy( vlc_object_t *p_this ) RemoveAllVout( p_vout ); + DEL_PARENT_CALLBACKS( SendEventsToChild ); + free( p_vout->p_sys->pp_vout ); free( p_vout->p_sys ); } @@ -364,21 +397,22 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) { - u8 *p_in, *p_in_end, *p_out; + uint8_t *p_in, *p_in_end, *p_out; int i_in_pitch = p_pic->p[i_plane].i_pitch; int i_out_pitch = p_outpic->p[i_plane].i_pitch; + int i_copy_pitch = p_outpic->p[i_plane].i_visible_pitch; p_in = p_pic->p[i_plane].p_pixels + pi_top_skip[i_plane] + pi_left_skip[i_plane]; - p_in_end = p_in + p_outpic->p[i_plane].i_lines + p_in_end = p_in + p_outpic->p[i_plane].i_visible_lines * p_pic->p[i_plane].i_pitch; p_out = p_outpic->p[i_plane].p_pixels; while( p_in < p_in_end ) { - p_vout->p_vlc->pf_memcpy( p_out, p_in, i_out_pitch ); + p_vout->p_vlc->pf_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; } @@ -397,7 +431,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) { pi_top_skip[i_plane] += p_vout->p_sys->pp_vout[ i_vout ].i_height - * p_pic->p[i_plane].i_lines + * p_pic->p[i_plane].i_visible_lines / p_vout->output.i_height * p_pic->p[i_plane].i_pitch; } @@ -414,8 +448,78 @@ static void RemoveAllVout( vout_thread_t *p_vout ) --p_vout->p_sys->i_vout; if( p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].b_active ) { - vout_DestroyThread( - p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout ); + DEL_CALLBACKS( + p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout, + SendEvents ); + vlc_object_detach( + p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout ); + vout_Destroy( + p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout ); } } } + +/***************************************************************************** + * 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_vout ) +{ + vout_thread_t *p_vout = (vout_thread_t *)_p_vout; + int i_vout; + vlc_value_t sentval = newval; + + /* Find the video output index */ + for( i_vout = 0; i_vout < p_vout->p_sys->i_vout; i_vout++ ) + { + if( p_this == (vlc_object_t *)p_vout->p_sys->pp_vout[ i_vout ].p_vout ) + { + break; + } + } + + if( i_vout == p_vout->p_sys->i_vout ) + { + return VLC_EGENERIC; + } + + /* Translate the mouse coordinates */ + if( !strcmp( psz_var, "mouse-x" ) ) + { + sentval.i_int += p_vout->output.i_width + * (i_vout % p_vout->p_sys->i_col) + / p_vout->p_sys->i_col; + } + else if( !strcmp( psz_var, "mouse-y" ) ) + { + sentval.i_int += p_vout->output.i_height + * (i_vout / p_vout->p_sys->i_row) + / p_vout->p_sys->i_row; + } + + var_Set( p_vout, psz_var, sentval ); + + 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 ) +{ + vout_thread_t *p_vout = (vout_thread_t *)p_this; + int i_row, i_col, i_vout = 0; + + for( i_row = 0; i_row < p_vout->p_sys->i_row; i_row++ ) + { + for( i_col = 0; i_col < p_vout->p_sys->i_col; i_col++ ) + { + var_Set( p_vout->p_sys->pp_vout[ i_vout ].p_vout, psz_var, newval); + if( !strcmp( psz_var, "fullscreen" ) ) break; + i_vout++; + } + } + + return VLC_SUCCESS; +}