X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fextract.c;h=b8d5681e43c06978558f2e3bf8c202a4ced1aa08;hb=053f9d6ea00435633c3dcbf87041d868223c9ec7;hp=05db7c876ccc8872d54fbebad9229ca0fd9b69d6;hpb=42bb236284b09355d8bfde47fb4915dd1f07aa68;p=vlc diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index 05db7c876c..b8d5681e43 100644 --- a/modules/video_filter/extract.c +++ b/modules/video_filter/extract.c @@ -31,9 +31,8 @@ #include #include -#include -#include "vlc_filter.h" +#include #include "filter_picture.h" #include "math.h" @@ -71,20 +70,20 @@ static const char *const ppsz_component_descriptions[] = { /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Extract RGB component video filter") ); - set_shortname( N_("Extract" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter2", 0 ); - add_shortcut( "extract" ); +vlc_module_begin () + set_description( N_("Extract RGB component video filter") ) + set_shortname( N_("Extract" )) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) + add_shortcut( "extract" ) add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF, - NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false ); - change_integer_list( pi_component_values, ppsz_component_descriptions, 0 ); + NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false ) + change_integer_list( pi_component_values, ppsz_component_descriptions, NULL ) - set_callbacks( Create, Destroy ); -vlc_module_end(); + set_callbacks( Create, Destroy ) +vlc_module_end () static const char *const ppsz_filter_options[] = { "component", NULL @@ -93,8 +92,9 @@ static const char *const ppsz_filter_options[] = { enum { RED=0xFF0000, GREEN=0x00FF00, BLUE=0x0000FF }; struct filter_sys_t { - int i_color; + vlc_mutex_t lock; int *projection_matrix; + uint32_t i_color; }; /***************************************************************************** @@ -106,20 +106,19 @@ static int Create( vlc_object_t *p_this ) switch( p_filter->fmt_in.video.i_chroma ) { - case VLC_FOURCC('I','4','2','0'): - case VLC_FOURCC('I','Y','U','V'): - case VLC_FOURCC('J','4','2','0'): - case VLC_FOURCC('Y','V','1','2'): + case VLC_CODEC_I420: + case VLC_CODEC_J420: + case VLC_CODEC_YV12: - case VLC_FOURCC('I','4','2','2'): - case VLC_FOURCC('J','4','2','2'): + case VLC_CODEC_I422: + case VLC_CODEC_J422: CASE_PACKED_YUV_422 break; default: /* We only want planar YUV 4:2:0 or 4:2:2 */ - msg_Err( p_filter, "Unsupported input chroma (%4s)", + msg_Err( p_filter, "Unsupported input chroma (%4.4s)", (char*)&(p_filter->fmt_in.video.i_chroma) ); return VLC_EGENERIC; } @@ -140,12 +139,12 @@ static int Create( vlc_object_t *p_this ) p_filter->p_sys->i_color = var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "component" ); - var_AddCallback( p_filter, FILTER_PREFIX "component", - ExtractCallback, p_filter->p_sys ); - /* Matrix won't be used for RED, GREEN or BLUE in planar formats */ make_projection_matrix( p_filter, p_filter->p_sys->i_color, p_filter->p_sys->projection_matrix ); + vlc_mutex_init( &p_filter->p_sys->lock ); + var_AddCallback( p_filter, FILTER_PREFIX "component", + ExtractCallback, p_filter->p_sys ); p_filter->pf_video_filter = Filter; @@ -158,9 +157,13 @@ static int Create( vlc_object_t *p_this ) static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys = p_filter->p_sys; - free( p_filter->p_sys->projection_matrix ); - free( p_filter->p_sys ); + var_DelCallback( p_filter, FILTER_PREFIX "component", ExtractCallback, + p_sys ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys->projection_matrix ); + free( p_sys ); } /***************************************************************************** @@ -169,25 +172,24 @@ static void Destroy( vlc_object_t *p_this ) static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; + filter_sys_t *p_sys = p_filter->p_sys; if( !p_pic ) return NULL; - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); + p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } + vlc_mutex_lock( &p_sys->lock ); switch( p_pic->format.i_chroma ) { - case VLC_FOURCC('I','4','2','0'): - case VLC_FOURCC('I','Y','U','V'): - case VLC_FOURCC('J','4','2','0'): - case VLC_FOURCC('Y','V','1','2'): - switch( p_filter->p_sys->i_color ) + case VLC_CODEC_I420: + case VLC_CODEC_J420: + case VLC_CODEC_YV12: + switch( p_sys->i_color ) { case RED: get_red_from_yuv420( p_pic, p_outpic, @@ -204,13 +206,13 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) default: get_custom_from_yuv420( p_pic, p_outpic, Y_PLANE, U_PLANE, V_PLANE, - p_filter->p_sys->projection_matrix); + p_sys->projection_matrix); break; } break; - case VLC_FOURCC('I','4','2','2'): - case VLC_FOURCC('J','4','2','2'): + case VLC_CODEC_I422: + case VLC_CODEC_J422: switch( p_filter->p_sys->i_color ) { case RED: @@ -228,23 +230,24 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) default: get_custom_from_yuv422( p_pic, p_outpic, Y_PLANE, U_PLANE, V_PLANE, - p_filter->p_sys->projection_matrix); + p_sys->projection_matrix); break; } break; CASE_PACKED_YUV_422 get_custom_from_packedyuv422( p_pic, p_outpic, - p_filter->p_sys->projection_matrix ); + p_sys->projection_matrix ); break; default: - msg_Warn( p_filter, "Unsupported input chroma (%4s)", + vlc_mutex_unlock( &p_sys->lock ); + msg_Warn( p_filter, "Unsupported input chroma (%4.4s)", (char*)&(p_pic->format.i_chroma) ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } + vlc_mutex_unlock( &p_sys->lock ); return CopyInfoAndRelease( p_outpic, p_pic ); } @@ -763,6 +766,7 @@ static int ExtractCallback( vlc_object_t *p_this, char const *psz_var, VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *)p_data; + vlc_mutex_lock( &p_sys->lock ); if( !strcmp( psz_var, FILTER_PREFIX "component" ) ) { p_sys->i_color = newval.i_int; @@ -774,5 +778,6 @@ static int ExtractCallback( vlc_object_t *p_this, char const *psz_var, { msg_Warn( p_this, "Unknown callback command." ); } + vlc_mutex_unlock( &p_sys->lock ); return VLC_SUCCESS; }