X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fextract.c;h=b8d5681e43c06978558f2e3bf8c202a4ced1aa08;hb=aa61f21988e3733c2a3eb36f9b57993f38a5635d;hp=cc82d66e8e82d7dd8183d9969906f5c10fa7d687;hpb=806cf5165824be921bf2402ecf11fd3ee6501f9c;p=vlc diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index cc82d66e8e..b8d5681e43 100644 --- a/modules/video_filter/extract.c +++ b/modules/video_filter/extract.c @@ -25,10 +25,14 @@ * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_filter.h" +#include +#include + +#include #include "filter_picture.h" #include "math.h" @@ -59,37 +63,38 @@ static void get_custom_from_packedyuv422( picture_t *, picture_t *, int * ); #define COMPONENT_LONGTEXT N_("RGB component to extract. 0 for Red, 1 for Green and 2 for Blue.") #define FILTER_PREFIX "extract-" -static int pi_component_values[] = { 0xFF0000, 0x00FF00, 0x0000FF }; -static const char *ppsz_component_descriptions[] = { "Red", "Green", "Blue" }; +static const int pi_component_values[] = { 0xFF0000, 0x00FF00, 0x0000FF }; +static const char *const ppsz_component_descriptions[] = { + "Red", "Green", "Blue" }; /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("Extract RGB component video filter") ); - set_shortname( _("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, VLC_FALSE ); - change_safe(); - 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 *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "component", NULL }; 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; }; /***************************************************************************** @@ -101,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; } @@ -122,15 +126,11 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_filter->p_sys->projection_matrix = malloc( 9 * sizeof( int ) ); if( !p_filter->p_sys->projection_matrix ) { free( p_filter->p_sys ); - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; } @@ -139,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; @@ -157,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 ); } /***************************************************************************** @@ -168,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, @@ -203,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: @@ -227,34 +230,26 @@ 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 ); - p_outpic->date = p_pic->date; - p_outpic->b_force = p_pic->b_force; - p_outpic->i_nb_fields = p_pic->i_nb_fields; - p_outpic->b_progressive = p_pic->b_progressive; - p_outpic->b_top_field_first = p_pic->b_top_field_first; - - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); - - return p_outpic; + return CopyInfoAndRelease( p_outpic, p_pic ); } static inline uint8_t crop( int a ) @@ -768,8 +763,10 @@ static int ExtractCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + 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; @@ -781,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; }