X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fwall.c;h=026ca8aef03a0850f1582e467e909bb58698b1a8;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=102c56207b618287d180ac83090ee36ba1aa9647;hpb=3719acf03a1a993d2d16c0479c3243f4c14c8437;p=vlc diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index 102c56207b..026ca8aef0 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -1,7 +1,7 @@ /***************************************************************************** * wall.c : Wall video plugin for vlc ***************************************************************************** - * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN + * Copyright (C) 2000, 2001, 2002, 2003 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -18,17 +18,15 @@ * * 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" @@ -51,32 +49,44 @@ static int SendEvents( vlc_object_t *, char const *, * Module descriptor *****************************************************************************/ #define COLS_TEXT N_("Number of columns") -#define COLS_LONGTEXT N_("Select the number of horizontal video windows in " \ +#define COLS_LONGTEXT N_("Number of horizontal windows in " \ "which to split the video.") #define ROWS_TEXT N_("Number of rows") -#define ROWS_LONGTEXT N_("Select the number of vertical video windows in " \ +#define ROWS_LONGTEXT N_("Number of vertical 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") +#define ASPECT_TEXT N_("Element aspect ratio") +#define ASPECT_LONGTEXT N_("Aspect ratio of the individual displays " \ + "building the wall.") + +#define CFG_PREFIX "wall-" + vlc_module_begin(); - set_description( _("wall video filter") ); - set_shortname( N_("Image wall" )); + set_description( _("Wall video filter") ); + set_shortname( _("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_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); + add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, + VLC_TRUE ); + add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE ); add_shortcut( "wall" ); set_callbacks( Create, Destroy ); vlc_module_end(); +static const char *ppsz_filter_options[] = { + "cols", "rows", "active", "element-aspect", NULL +}; + /***************************************************************************** * vout_sys_t: Wall video output method descriptor ***************************************************************************** @@ -144,9 +154,12 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_display = NULL; p_vout->pf_control = Control; + config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options, + p_vout->p_cfg ); + /* Look what method was requested */ - p_vout->p_sys->i_col = config_GetInt( p_vout, "wall-cols" ); - p_vout->p_sys->i_row = config_GetInt( p_vout, "wall-rows" ); + p_vout->p_sys->i_col = var_CreateGetInteger( p_vout, CFG_PREFIX "cols" ); + p_vout->p_sys->i_row = var_CreateGetInteger( p_vout, CFG_PREFIX "rows" ); p_vout->p_sys->i_col = __MAX( 1, __MIN( 15, p_vout->p_sys->i_col ) ); p_vout->p_sys->i_row = __MAX( 1, __MIN( 15, p_vout->p_sys->i_row ) ); @@ -164,7 +177,8 @@ static int Create( vlc_object_t *p_this ) return VLC_ENOMEM; } - psz_method_tmp = psz_method = config_GetPsz( p_vout, "wall-active" ); + psz_method_tmp = + psz_method = var_CreateGetNonEmptyString( p_vout, CFG_PREFIX "active" ); /* If no trailing vout are specified, take them all */ if( psz_method == NULL ) @@ -225,11 +239,34 @@ static int Init( vout_thread_t *p_vout ) int i_index, i_row, i_col, i_width, i_height, i_left, i_top; unsigned int i_target_width,i_target_height; picture_t *p_pic; + video_format_t fmt; int i_aspect = 4*VOUT_ASPECT_FACTOR/3; int i_align = 0; unsigned int i_hstart, i_hend, i_vstart, i_vend; unsigned int w1,h1,w2,h2; int i_xpos, i_ypos; + int i_vstart_rounded = 0, i_hstart_rounded = 0; + char *psz_aspect; + + memset( &fmt, 0, sizeof(video_format_t) ); + + psz_aspect = var_CreateGetNonEmptyString( p_vout, + CFG_PREFIX "element-aspect" ); + if( psz_aspect && *psz_aspect ) + { + char *psz_parser = strchr( psz_aspect, ':' ); + if( psz_parser ) + { + *psz_parser++ = '\0'; + i_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR + / atoi( psz_parser ); + } + else + { + msg_Warn( p_vout, "invalid aspect ratio specification" ); + } + free( psz_aspect ); + } i_xpos = var_CreateGetInteger( p_vout, "video-x" ); i_ypos = var_CreateGetInteger( p_vout, "video-y" ); @@ -245,30 +282,50 @@ static int Init( vout_thread_t *p_vout ) p_vout->output.i_aspect = p_vout->render.i_aspect; var_Create( p_vout, "align", VLC_VAR_INTEGER ); + fmt.i_width = fmt.i_visible_width = p_vout->render.i_width; + fmt.i_height = fmt.i_visible_height = p_vout->render.i_height; + fmt.i_x_offset = fmt.i_y_offset = 0; + fmt.i_chroma = p_vout->render.i_chroma; + fmt.i_aspect = p_vout->render.i_aspect; + fmt.i_sar_num = p_vout->render.i_aspect * fmt.i_height / fmt.i_width; + fmt.i_sar_den = VOUT_ASPECT_FACTOR; + w1 = p_vout->output.i_width / p_vout->p_sys->i_col; - h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect; - - h2 = p_vout->output.i_height / p_vout->p_sys->i_row; - w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR; - + w1 &= ~1; + h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1; + h1 &= ~1; + + h2 = p_vout->output.i_height / p_vout->p_sys->i_row&~1; + h2 &= ~1; + w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR&~1; + w2 &= ~1; + if ( h1 * p_vout->p_sys->i_row < p_vout->output.i_height ) { - i_target_width = w2; + unsigned int i_tmp; + i_target_width = w2; i_target_height = h2; i_vstart = 0; i_vend = p_vout->output.i_height; - i_hstart = ( i_target_width * p_vout->p_sys->i_col - - p_vout->output.i_width ) / 2; + i_tmp = i_target_width * p_vout->p_sys->i_col; + while( i_tmp < p_vout->output.i_width ) i_tmp += p_vout->p_sys->i_col; + i_hstart = (( i_tmp - p_vout->output.i_width ) / 2)&~1; + i_hstart_rounded = ( ( i_tmp - p_vout->output.i_width ) % 2 ) || + ( ( ( i_tmp - p_vout->output.i_width ) / 2 ) & 1 ); i_hend = i_hstart + p_vout->output.i_width; } else { + unsigned int i_tmp; i_target_height = h1; i_target_width = w1; i_hstart = 0; i_hend = p_vout->output.i_width; - i_vstart = ( i_target_height * p_vout->p_sys->i_row - - p_vout->output.i_height ) / 2; + i_tmp = i_target_height * p_vout->p_sys->i_row; + while( i_tmp < p_vout->output.i_height ) i_tmp += p_vout->p_sys->i_row; + i_vstart = ( ( i_tmp - p_vout->output.i_height ) / 2 ) & ~1; + i_vstart_rounded = ( ( i_tmp - p_vout->output.i_height ) % 2 ) || + ( ( ( i_tmp - p_vout->output.i_height ) / 2 ) & 1 ); i_vend = i_vstart + p_vout->output.i_height; } msg_Dbg( p_vout, "target resolution %dx%d", i_target_width, i_target_height ); @@ -278,7 +335,7 @@ static int Init( vout_thread_t *p_vout ) p_vout->p_sys->i_vout = 0; msg_Dbg( p_vout, "target window (%d,%d)-(%d,%d)", i_hstart,i_vstart,i_hend,i_vend ); - + i_top = 0; i_height = 0; @@ -298,15 +355,22 @@ static int Init( vout_thread_t *p_vout ) else if( ( i_col + 1 ) * i_target_width < i_hstart || ( i_col * i_target_width ) > i_hend ) { - i_width = 0; + i_width = 0; } else { - i_width = i_target_width - i_hstart % i_target_width; - i_align |= i_col > ( p_vout->p_sys->i_col / 2 ) ? - VOUT_ALIGN_LEFT : VOUT_ALIGN_RIGHT; + i_width = ( i_target_width - i_hstart % i_target_width ); + if( i_col >= ( p_vout->p_sys->i_col / 2 ) ) + { + i_align |= VOUT_ALIGN_LEFT; + i_width -= i_hstart_rounded ? 2: 0; + } + else + { + i_align |= VOUT_ALIGN_RIGHT; + } } - + if( i_row * i_target_height >= i_vstart && ( i_row + 1 ) * i_target_height <= i_vend ) { @@ -319,10 +383,17 @@ static int Init( vout_thread_t *p_vout ) } else { - i_height = i_target_height - - i_vstart%i_target_height; - i_align |= i_row > ( p_vout->p_sys->i_row / 2 ) ? - VOUT_ALIGN_TOP : VOUT_ALIGN_BOTTOM; + i_height = ( i_target_height - + i_vstart%i_target_height ); + if( i_row >= ( p_vout->p_sys->i_row / 2 ) ) + { + i_align |= VOUT_ALIGN_TOP; + i_height -= i_vstart_rounded ? 2: 0; + } + else + { + i_align |= VOUT_ALIGN_BOTTOM; + } } if( i_height == 0 || i_width == 0 ) { @@ -344,13 +415,14 @@ static int Init( vout_thread_t *p_vout ) var_SetInteger( p_vout, "video-x", i_left + i_xpos - i_width); var_SetInteger( p_vout, "video-y", i_top + i_ypos ); + fmt.i_width = fmt.i_visible_width = i_width; + fmt.i_height = fmt.i_visible_height = i_height; + fmt.i_aspect = i_aspect * i_target_height / i_height * + i_width / i_target_width; + p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout = - 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 ) + vout_Create( p_vout, &fmt ); + if( !p_vout->p_sys->pp_vout[ p_vout->p_sys->i_vout ].p_vout ) { msg_Err( p_vout, "failed to get %ix%i vout threads", p_vout->p_sys->i_col, p_vout->p_sys->i_row ); @@ -471,7 +543,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; }