/*****************************************************************************
* 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 <sam@zoy.org>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* 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.")
+
vlc_module_begin();
- set_description( _("wall video filter") );
+ set_description( _("Wall video filter") );
set_shortname( N_("Image wall" ));
set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
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_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
+ VLC_TRUE );
+ add_string( "wall-element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, VLC_FALSE );
add_shortcut( "wall" );
set_callbacks( Create, Destroy );
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 = {0};
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;
+
+ psz_aspect = config_GetPsz( p_vout, "wall-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" );
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;
+ w1 &= ~1;
+ h1 = w1 * VOUT_ASPECT_FACTOR / i_aspect&~1;
+ h1 &= ~1;
- h2 = p_vout->output.i_height / p_vout->p_sys->i_row;
- w2 = h2 * i_aspect / VOUT_ASPECT_FACTOR;
+ 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 )
{
+ 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 );
}
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 &&
}
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 )
{
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 );
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;
}
projects / vlc / blobdiff