/*****************************************************************************
* crop.c : Crop video plugin for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: crop.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * Copyright (C) 2002, 2003 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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
*
* 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 <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include <vlc/vlc.h>
#include <vlc/vout.h>
+#include <vlc_interaction.h>
#include "filter_common.h"
static void UpdateStats ( vout_thread_t *, picture_t * );
+static int SendEvents( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define GEOMETRY_TEXT N_("Crop geometry")
-#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop")
+#define GEOMETRY_TEXT N_("Crop geometry (pixels)")
+#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop. This is set as <width> x <height> + <left offset> + <top offset>.")
#define AUTOCROP_TEXT N_("Automatic cropping")
-#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping")
+#define AUTOCROP_LONGTEXT N_("Automatic black border cropping.")
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT );
- add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT );
- set_description( _("image crop video module") );
+ set_description( _("Crop video filter") );
+ set_shortname( N_("Crop" ));
+ set_category( CAT_VIDEO );
+ set_subcategory( SUBCAT_VIDEO_VFILTER );
set_capability( "video filter", 0 );
+
+ add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE );
+ add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE );
+
add_shortcut( "crop" );
set_callbacks( Create, Destroy );
vlc_module_end();
vlc_bool_t b_changed;
};
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+ return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
+}
+
/*****************************************************************************
* Create: allocates Crop video thread output method
*****************************************************************************
if( p_vout->p_sys == NULL )
{
msg_Err( p_vout, "out of memory" );
- return 1;
+ return VLC_ENOMEM;
}
p_vout->pf_init = Init;
p_vout->pf_manage = Manage;
p_vout->pf_render = Render;
p_vout->pf_display = NULL;
+ p_vout->pf_control = Control;
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
int i_index;
char *psz_var;
picture_t *p_pic;
-
+ video_format_t fmt = {0};
+
I_OUTPUTPICTURES = 0;
p_vout->p_sys->i_lastchange = 0;
- p_vout->p_sys->b_changed = 0;
+ p_vout->p_sys->b_changed = VLC_FALSE;
/* 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;
/* Shall we use autocrop ? */
p_vout->p_sys->b_autocrop = config_GetInt( p_vout, "autocrop" );
}
else
{
- p_vout->p_sys->i_width = p_vout->output.i_width;
- p_vout->p_sys->i_height = p_vout->output.i_height;
- p_vout->p_sys->i_x = p_vout->p_sys->i_y = 0;
+ p_vout->p_sys->i_width = p_vout->fmt_out.i_visible_width;
+ p_vout->p_sys->i_height = p_vout->fmt_out.i_visible_height;
+ p_vout->p_sys->i_x = p_vout->fmt_out.i_x_offset;
+ p_vout->p_sys->i_y = p_vout->fmt_out.i_y_offset;
}
/* Pheeew. Parsing done. */
p_vout->p_sys->b_autocrop ? "" : "not " );
/* Set current output image properties */
- p_vout->p_sys->i_aspect = p_vout->output.i_aspect
- * p_vout->output.i_height / p_vout->p_sys->i_height
- * p_vout->p_sys->i_width / p_vout->output.i_width;
+ p_vout->p_sys->i_aspect = p_vout->fmt_out.i_aspect
+ * p_vout->fmt_out.i_visible_height / p_vout->p_sys->i_height
+ * p_vout->p_sys->i_width / p_vout->fmt_out.i_visible_width;
+
+ fmt.i_width = fmt.i_visible_width = p_vout->p_sys->i_width;
+ fmt.i_height = fmt.i_visible_height = p_vout->p_sys->i_height;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ fmt.i_chroma = p_vout->render.i_chroma;
+ fmt.i_aspect = p_vout->p_sys->i_aspect;
+ fmt.i_sar_num = p_vout->p_sys->i_aspect * fmt.i_height / fmt.i_width;
+ fmt.i_sar_den = VOUT_ASPECT_FACTOR;
/* Try to open the real video output */
- p_vout->p_sys->p_vout =
- vout_CreateThread( p_vout,
- p_vout->p_sys->i_width, p_vout->p_sys->i_height,
- p_vout->render.i_chroma, p_vout->p_sys->i_aspect );
+ p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
- return 0;
+ intf_UserFatal( p_vout, VLC_FALSE, _("Cropping failed"),
+ _("VLC could not open the video output module.") );
+ return VLC_EGENERIC;
}
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
- return 0;
+ ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+
+ ADD_PARENT_CALLBACKS( SendEventsToChild );
+
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vout_DestroyThread( p_vout->p_sys->p_vout );
+ if( p_vout->p_sys->p_vout )
+ {
+ DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+ vlc_object_detach( p_vout->p_sys->p_vout );
+ vout_Destroy( p_vout->p_sys->p_vout );
+ }
+
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
free( p_vout->p_sys );
}
*****************************************************************************/
static int Manage( vout_thread_t *p_vout )
{
+ video_format_t fmt = {0};
+
if( !p_vout->p_sys->b_changed )
{
- return 0;
+ return VLC_SUCCESS;
}
- vout_DestroyThread( p_vout->p_sys->p_vout );
+ vout_Destroy( p_vout->p_sys->p_vout );
+
+ fmt.i_width = fmt.i_visible_width = p_vout->p_sys->i_width;
+ fmt.i_height = fmt.i_visible_height = p_vout->p_sys->i_height;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ fmt.i_chroma = p_vout->render.i_chroma;
+ fmt.i_aspect = p_vout->p_sys->i_aspect;
+ fmt.i_sar_num = p_vout->p_sys->i_aspect * fmt.i_height / fmt.i_width;
+ fmt.i_sar_den = VOUT_ASPECT_FACTOR;
- p_vout->p_sys->p_vout =
- vout_CreateThread( p_vout,
- p_vout->p_sys->i_width, p_vout->p_sys->i_height,
- p_vout->render.i_chroma, p_vout->p_sys->i_aspect );
+ p_vout->p_sys->p_vout = vout_Create( p_vout, &fmt );
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
- return 1;
+ intf_UserFatal( p_vout, VLC_FALSE, _("Cropping failed"),
+ _("VLC could not open the video output module.") );
+ return VLC_EGENERIC;
}
- p_vout->p_sys->b_changed = 0;
+ p_vout->p_sys->b_changed = VLC_FALSE;
p_vout->p_sys->i_lastchange = 0;
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
{
- u8 *p_in, *p_out, *p_out_end;
+ uint8_t *p_in, *p_out, *p_out_end;
int i_in_pitch = p_pic->p[i_plane].i_pitch;
const int i_out_pitch = p_outpic->p[i_plane].i_pitch;
+ const int i_copy_pitch = p_outpic->p[i_plane].i_visible_pitch;
p_in = p_pic->p[i_plane].p_pixels
/* Skip the right amount of lines */
- + i_in_pitch * ( p_pic->p[i_plane].i_lines * p_vout->p_sys->i_y
- / p_vout->output.i_height )
+ + i_in_pitch * ( p_pic->p[i_plane].i_visible_lines *
+ p_vout->p_sys->i_y / p_vout->output.i_height )
/* Skip the right amount of columns */
+ i_in_pitch * p_vout->p_sys->i_x / p_vout->output.i_width;
p_out = p_outpic->p[i_plane].p_pixels;
- p_out_end = p_out + i_out_pitch * p_outpic->p[i_plane].i_lines;
+ p_out_end = p_out + i_out_pitch * p_outpic->p[i_plane].i_visible_lines;
while( p_out < p_out_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;
}
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
/* The source image may still be in the cache ... parse it! */
- if( !p_vout->p_sys->b_autocrop )
+ if( p_vout->p_sys->b_autocrop )
{
- return;
+ UpdateStats( p_vout, p_pic );
}
-
- UpdateStats( p_vout, p_pic );
}
static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic )
{
- u8 *p_in = p_pic->p[0].p_pixels;
+ uint8_t *p_in = p_pic->p[0].p_pixels;
int i_pitch = p_pic->p[0].i_pitch;
- int i_lines = p_pic->p[0].i_lines;
+ int i_visible_pitch = p_pic->p[0].i_visible_pitch;
+ int i_lines = p_pic->p[0].i_visible_lines;
int i_firstwhite = -1, i_lastwhite = -1, i;
/* Determine where black borders are */
const int i_col = i * i_pitch / i_lines;
if( p_in[i_col/2] > 40
- && p_in[i_pitch / 2] > 40
- && p_in[i_pitch/2 + i_col/2] > 40 )
+ && p_in[i_visible_pitch/2] > 40
+ && p_in[i_visible_pitch/2 + i_col/2] > 40 )
{
if( i_lastwhite == -1 )
{
return;
}
- if( i_lastwhite - i_firstwhite < p_vout->p_sys->i_height / 2 )
+ if( (unsigned int)(i_lastwhite - i_firstwhite)
+ < p_vout->p_sys->i_height / 2 )
{
p_vout->p_sys->i_lastchange = 0;
return;
}
- if( i_lastwhite - i_firstwhite < p_vout->p_sys->i_height + 16
- && i_lastwhite - i_firstwhite + 16 > p_vout->p_sys->i_height )
+ if( (unsigned int)(i_lastwhite - i_firstwhite)
+ < p_vout->p_sys->i_height + 16
+ && (unsigned int)(i_lastwhite - i_firstwhite + 16)
+ > p_vout->p_sys->i_height )
{
p_vout->p_sys->i_lastchange = 0;
return;
* p_vout->output.i_height / p_vout->p_sys->i_height
* p_vout->p_sys->i_width / p_vout->output.i_width;
- p_vout->p_sys->b_changed = 1;
+ p_vout->p_sys->b_changed = VLC_TRUE;
+}
+
+/*****************************************************************************
+ * 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;
+ vlc_value_t sentval = newval;
+
+ /* Translate the mouse coordinates */
+ if( !strcmp( psz_var, "mouse-x" ) )
+ {
+ sentval.i_int += p_vout->p_sys->i_x;
+ }
+ else if( !strcmp( psz_var, "mouse-y" ) )
+ {
+ sentval.i_int += p_vout->p_sys->i_y;
+ }
+
+ 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;
+ var_Set( p_vout->p_sys->p_vout, psz_var, newval );
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff