X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fcrop.c;h=fe89d9ec844176b1285eec6189746d4f85468174;hb=c1848b08af53aa42cf1f26e05863a5d7a93e2500;hp=6a930359c6725719dbc7b4739a95b6e88a4f8855;hpb=cf09f019ea5eae5b411a75b61e67a9adb32426fe;p=vlc diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index 6a930359c6..fe89d9ec84 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -56,7 +56,7 @@ static void Render ( vout_thread_t *, picture_t * ); static void UpdateStats ( vout_thread_t *, picture_t * ); -static int SendEvents( vlc_object_t *, char const *, +static int MouseEvent( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); #ifdef BEST_AUTOCROP @@ -76,6 +76,8 @@ static int FilterCallback ( vlc_object_t *, char const *, #define AUTOCROP_TEXT N_("Automatic cropping") #define AUTOCROP_LONGTEXT N_("Automatically detect black borders and crop them.") +#define CROP_HELP N_("Remove borders of the video and replace them by black borders") + #ifdef BEST_AUTOCROP #define RATIOMAX_TEXT N_("Ratio max (x 1000)") #define RATIOMAX_LONGTEXT N_("Maximum image ratio. The crop plugin will never automatically crop to a higher ratio (ie, to a more \"flat\" image). The value is x1000: 1333 means 4/3.") @@ -103,13 +105,14 @@ static int FilterCallback ( vlc_object_t *, char const *, vlc_module_begin () set_description( N_("Crop video filter") ) set_shortname( N_("Crop" )) + set_help(CROP_HELP) set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) set_capability( "video filter", 0 ) add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, false ) - add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, + add_bool( "autocrop", false, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, false ) #ifdef BEST_AUTOCROP @@ -145,6 +148,7 @@ vlc_module_end () *****************************************************************************/ struct vout_sys_t { + vlc_mutex_t lock; vout_thread_t *p_vout; unsigned int i_x, i_y; @@ -200,9 +204,7 @@ static int Create( vlc_object_t *p_this ) *****************************************************************************/ static int Init( vout_thread_t *p_vout ) { - int i_index; char *psz_var; - picture_t *p_pic; video_format_t fmt; I_OUTPUTPICTURES = 0; @@ -230,10 +232,7 @@ static int Init( vout_thread_t *p_vout ) config_GetInt( p_vout, "autocrop-non-black-pixels" ); p_vout->p_sys->i_diff = config_GetInt( p_vout, "autocrop-diff" ); p_vout->p_sys->i_time = config_GetInt( p_vout, "autocrop-time" ); - vlc_value_t val={0}; - var_Get( p_vout, "ratio-crop", &val ); - val.psz_string = "0"; - var_SetString( p_vout, "ratio-crop", val.psz_string); + var_SetString( p_vout, "ratio-crop", "0" ); if (p_vout->p_sys->b_autocrop) p_vout->p_sys->i_ratio = 0; @@ -355,9 +354,9 @@ static int Init( vout_thread_t *p_vout ) p_vout->p_sys->i_x, p_vout->p_sys->i_y, p_vout->p_sys->b_autocrop ? "" : "not " ); /* Set current output image properties */ - 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; + p_vout->p_sys->i_aspect = (int64_t)VOUT_ASPECT_FACTOR * + p_vout->fmt_out.i_sar_num * p_vout->p_sys->i_width / + (p_vout->fmt_out.i_sar_den * p_vout->p_sys->i_height); #ifdef BEST_AUTOCROP msg_Info( p_vout, "ratio %d", p_vout->p_sys->i_aspect / 432); @@ -366,29 +365,27 @@ static int Init( vout_thread_t *p_vout ) 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; + fmt.i_sar_num = p_vout->p_sys->i_aspect * fmt.i_height; + fmt.i_sar_den = VOUT_ASPECT_FACTOR * fmt.i_width; /* Try to open the real video output */ 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" ); - dialog_Fatal( p_vout, _("Cropping failed"), + dialog_Fatal( p_vout, _("Cropping failed"), "%s", _("VLC could not open the video output module.") ); return VLC_EGENERIC; } + vlc_mutex_init( &p_vout->p_sys->lock ); #ifdef BEST_AUTOCROP var_AddCallback( p_vout, "ratio-crop", FilterCallback, NULL ); #endif - ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + vout_filter_AllocateDirectBuffers( p_vout, VOUT_MAX_PICTURES ); - ADD_PARENT_CALLBACKS( SendEventsToChild ); + vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent ); return VLC_SUCCESS; } @@ -398,21 +395,17 @@ static int Init( vout_thread_t *p_vout ) *****************************************************************************/ static void End( vout_thread_t *p_vout ) { - int i_index; + vout_sys_t *p_sys = p_vout->p_sys; - DEL_PARENT_CALLBACKS( SendEventsToChild ); - if( p_vout->p_sys->p_vout ) - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - - /* Free the fake output buffers we allocated */ - for( i_index = I_OUTPUTPICTURES ; i_index ; ) + if( p_sys->p_vout ) { - i_index--; - free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); + vout_filter_DelChild( p_vout, p_sys->p_vout, MouseEvent ); + vout_CloseAndRelease( p_sys->p_vout ); } - if( p_vout->p_sys->p_vout ) - vout_CloseAndRelease( p_vout->p_sys->p_vout ); + vout_filter_ReleaseDirectBuffers( p_vout ); + var_DelCallback( p_vout, "ratio-crop", FilterCallback, NULL ); + vlc_mutex_destroy( &p_sys->lock ); } /***************************************************************************** @@ -445,6 +438,7 @@ static int Manage( vout_thread_t *p_vout ) memset( &fmt, 0, sizeof(video_format_t) ); #ifdef BEST_AUTOCROP + /* XXX: not thread-safe with FilterCallback */ msg_Dbg( p_vout, "cropping at %ix%i+%i+%i, %sautocropping", p_vout->p_sys->i_width, p_vout->p_sys->i_height, p_vout->p_sys->i_x, p_vout->p_sys->i_y, @@ -455,7 +449,7 @@ static int Manage( vout_thread_t *p_vout ) if( p_vout->p_sys->p_vout ) { - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + vout_filter_DelChild( p_vout, p_vout->p_sys->p_vout, MouseEvent ); vout_CloseAndRelease( p_vout->p_sys->p_vout ); } @@ -463,7 +457,6 @@ static int Manage( vout_thread_t *p_vout ) 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; @@ -471,14 +464,16 @@ static int Manage( vout_thread_t *p_vout ) if( p_vout->p_sys->p_vout == NULL ) { msg_Err( p_vout, "failed to create vout" ); - dialog_Fatal( p_vout, _("Cropping failed"), + dialog_Fatal( p_vout, _("Cropping failed"), "%s", _("VLC could not open the video output module.") ); return VLC_EGENERIC; } - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); + vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent ); p_vout->p_sys->b_changed = false; + vlc_mutex_lock( &p_vout->p_sys->lock ); p_vout->p_sys->i_lastchange = 0; + vlc_mutex_unlock( &p_vout->p_sys->lock ); return VLC_SUCCESS; } @@ -545,10 +540,10 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); /* The source image may still be in the cache ... parse it! */ + vlc_mutex_lock( &p_vout->p_sys->lock ); if( p_vout->p_sys->b_autocrop ) - { UpdateStats( p_vout, p_pic ); - } + vlc_mutex_unlock( &p_vout->p_sys->lock ); } #ifdef BEST_AUTOCROP @@ -564,15 +559,13 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, switch(i_chroma) { // planar YUV - case VLC_FOURCC('I','4','4','4'): - case VLC_FOURCC('I','4','2','2'): - case VLC_FOURCC('I','4','2','0'): - case VLC_FOURCC('Y','V','1','2'): - case VLC_FOURCC('I','Y','U','V'): - case VLC_FOURCC('I','4','1','1'): - case VLC_FOURCC('I','4','1','0'): - case VLC_FOURCC('Y','V','U','9'): - case VLC_FOURCC('Y','U','V','A'): + case VLC_CODEC_I444: + case VLC_CODEC_I422: + case VLC_CODEC_I420: + case VLC_CODEC_YV12: + case VLC_CODEC_I411: + case VLC_CODEC_I410: + case VLC_CODEC_YUVA: i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = i_col/2 + i_skipCount/2; i_index <= i_visible_pitch/2 + i_col/2 - i_skipCount/2; @@ -583,7 +576,7 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, } break; // packed RGB - case VLC_FOURCC('R','G','B','2'): // packed by 1 + case VLC_CODEC_RGB8: // packed by 1 i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = i_col/2 + i_skipCount/2; i_index <= i_visible_pitch/2 + i_col/2 - i_skipCount/2; @@ -593,8 +586,8 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, if (i_count > i_nonBlackPixel) break; } break; - case VLC_FOURCC('R','V','1','5'): // packed by 2 - case VLC_FOURCC('R','V','1','6'): // packed by 2 + case VLC_CODEC_RGB15: // packed by 2 + case VLC_CODEC_RGB16: // packed by 2 i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = i_col/2 + i_skipCount/2 - (i_col/2 + i_skipCount/2) % 2; @@ -606,7 +599,7 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, if (i_count > i_nonBlackPixel) break; } break; - case VLC_FOURCC('R','V','2','4'): // packed by 3 + case VLC_CODEC_RGB24: // packed by 3 i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = i_col/2 + i_skipCount/2 - (i_col/2 + i_skipCount/2) % 3; i_index <= i_visible_pitch/2 + i_col/2 - i_skipCount/2; i_index+=3) { @@ -616,7 +609,7 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, if (i_count > i_nonBlackPixel) break; } break; - case VLC_FOURCC('R','V','3','2'): // packed by 4 + case VLC_CODEC_RGB32: // packed by 4 i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = i_col/2 + i_skipCount/2 - (i_col/2 + i_skipCount/2) % 4; i_index <= i_visible_pitch/2 + i_col/2 - i_skipCount/2; i_index+=4) { @@ -625,11 +618,8 @@ static bool NonBlackLine(uint8_t *p_in, int i_line, int i_pitch, } break; // packed YUV - case VLC_FOURCC('Y','U','Y','2'): // packed by 2 - case VLC_FOURCC('Y','U','N','V'): // packed by 2 - case VLC_FOURCC('U','Y','V','Y'): // packed by 2 - case VLC_FOURCC('U','Y','N','V'): // packed by 2 - case VLC_FOURCC('Y','4','2','2'): // packed by 2 + case VLC_CODEC_YUYV: // packed by 2 + case VLC_CODEC_UYVY: // packed by 2 i_skipCount = (i_pitch * i_skipCountPercent) / 100; for (i_index = (i_col/2 + i_skipCount/2) - (i_col/2 + i_skipCount/2) % 2; @@ -746,7 +736,7 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic ) /* Determine where black borders are */ switch( p_vout->output.i_chroma ) { - case VLC_FOURCC('I','4','2','0'): + case VLC_CODEC_I420: /* XXX: Do not laugh ! I know this is very naive. But it's just a * proof of concept code snippet... */ for( i = i_lines ; i-- ; ) @@ -829,41 +819,23 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->p_sys->b_changed = 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 ) +/** + * Forward mouse event with proper conversion. + */ +static int MouseEvent( 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 = p_data; VLC_UNUSED(p_this); VLC_UNUSED(oldval); - vout_thread_t *p_vout = (vout_thread_t *)_p_vout; - vlc_value_t sentval = newval; - /* Translate the mouse coordinates */ + /* Translate the mouse coordinates + * FIXME missing lock */ if( !strcmp( psz_var, "mouse-x" ) ) - { - sentval.i_int += p_vout->p_sys->i_x; - } + newval.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; -} + newval.i_int += p_vout->p_sys->i_y; -/***************************************************************************** - * 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 ) -{ - VLC_UNUSED(p_data); VLC_UNUSED(oldval); - vout_thread_t *p_vout = (vout_thread_t *)p_this; - var_Set( p_vout->p_sys->p_vout, psz_var, newval ); - return VLC_SUCCESS; + return var_Set( p_vout, psz_var, newval ); } #ifdef BEST_AUTOCROP @@ -879,6 +851,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_var, if( !strcmp( psz_var, "ratio-crop" ) ) { + vlc_mutex_lock( &p_vout->p_sys->lock ); if ( !strcmp( newval.psz_string, "Auto" ) ) p_vout->p_sys->i_ratio = 0; else @@ -896,6 +869,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_var, if (p_vout->p_sys->i_ratio < p_vout->output.i_aspect / 432) p_vout->p_sys->i_ratio = p_vout->output.i_aspect / 432; } + vlc_mutex_unlock( &p_vout->p_sys->lock ); } return VLC_SUCCESS; }