X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fcrop.c;h=4b196efd54d2e76a01810ac497bfa4a319d6d7dc;hb=5f18b9dd6aa22cd5d3cb77aa168e13eb10ac7c26;hp=e37d02702770810d99aa338ae9914278a42dea89;hpb=923649f961cc8f5c5c465fe72501f34bc1ea54fe;p=vlc diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index e37d027027..4b196efd54 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -1,8 +1,8 @@ /***************************************************************************** * crop.c : Crop video plugin for vlc ***************************************************************************** - * Copyright (C) 2002, 2003 VideoLAN - * $Id: crop.c,v 1.14 2004/01/25 03:28:41 hartman Exp $ + * Copyright (C) 2002, 2003 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -52,17 +52,21 @@ static int SendEvents( vlc_object_t *, char const *, * Module descriptor *****************************************************************************/ #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 heigth + left offset + top offset.") +#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop. This is set as x + + .") #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_("Crop"), NULL, VLC_FALSE ); - add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE ); - add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE ); 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(); @@ -87,6 +91,14 @@ struct vout_sys_t 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 ***************************************************************************** @@ -109,6 +121,7 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_manage = Manage; p_vout->pf_render = Render; p_vout->pf_display = NULL; + p_vout->pf_control = Control; return VLC_SUCCESS; } @@ -121,6 +134,7 @@ static int Init( vout_thread_t *p_vout ) int i_index; char *psz_var; picture_t *p_pic; + video_format_t fmt = {0}; I_OUTPUTPICTURES = 0; @@ -132,6 +146,7 @@ static int Init( vout_thread_t *p_vout ) 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" ); @@ -218,9 +233,10 @@ static int Init( vout_thread_t *p_vout ) } 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. */ @@ -230,14 +246,20 @@ static int Init( vout_thread_t *p_vout ) 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_Create( 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" ); @@ -277,9 +299,12 @@ static void Destroy( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; - 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 ); + 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 ); @@ -294,6 +319,8 @@ static void Destroy( vlc_object_t *p_this ) *****************************************************************************/ static int Manage( vout_thread_t *p_vout ) { + video_format_t fmt = {0}; + if( !p_vout->p_sys->b_changed ) { return VLC_SUCCESS; @@ -301,9 +328,15 @@ static int Manage( vout_thread_t *p_vout ) vout_Destroy( p_vout->p_sys->p_vout ); - p_vout->p_sys->p_vout = vout_Create( 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 ); + 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_Create( p_vout, &fmt ); if( p_vout->p_sys->p_vout == NULL ) { msg_Err( p_vout, "failed to create vout" ); @@ -358,13 +391,13 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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 ) { @@ -389,7 +422,7 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic ) uint8_t *p_in = p_pic->p[0].p_pixels; int i_pitch = p_pic->p[0].i_pitch; int i_visible_pitch = p_pic->p[0].i_visible_pitch; - int i_lines = p_pic->p[0].i_lines; + int i_lines = p_pic->p[0].i_visible_lines; int i_firstwhite = -1, i_lastwhite = -1, i; /* Determine where black borders are */