X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fcolorthres.c;h=eecbe20ac0bc7d4ab68bf263161b57eee994f0af;hb=1ce4f166a9653d8ee369862ee3111cce91af815d;hp=bb0bfabe43979100a91bf3c251566d4ab56d5910;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index bb0bfabe43..eecbe20ac0 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -1,10 +1,11 @@ /***************************************************************************** - * colorthres.c: Theshold color based on similarity to reference color + * colorthres.c: Threshold color based on similarity to reference color ***************************************************************************** - * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2000-2009 the VideoLAN team * $Id$ * * Authors: Sigmund Augdal + * Antoine Cellerier * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,18 +25,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include + +#include +#include #include -#include -#include "vlc_filter.h" +#include +#include "filter_picture.h" /***************************************************************************** * Local prototypes @@ -44,6 +46,7 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); static picture_t *Filter( filter_t *, picture_t * ); +static picture_t *FilterPacked( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor @@ -53,39 +56,52 @@ static picture_t *Filter( filter_t *, picture_t * ); "grayscaled. This must be an hexadecimal (like HTML colors). The first two "\ "chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\ " #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" ) -static int pi_color_values[] = { +#define COLOR_HELP N_("Select one color in the video") +static const int pi_color_values[] = { 0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x0000FF00, 0x000000FF, 0x0000FFFF }; -static const char *ppsz_color_descriptions[] = { +static const char *const ppsz_color_descriptions[] = { N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Lime"), N_("Blue"), N_("Aqua") }; #define CFG_PREFIX "colorthres-" -vlc_module_begin(); - set_description( _("Color threshold filter") ); - set_shortname( _("Color threshold" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter2", 0 ); +vlc_module_begin () + set_description( N_("Color threshold filter") ) + set_shortname( N_("Color threshold" )) + set_help(COLOR_HELP) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT, - COLOR_LONGTEXT, false ); - change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); + COLOR_LONGTEXT, false ) + change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ) add_integer( CFG_PREFIX "saturationthres", 20, NULL, - _("Saturaton threshold"), "", false ); + N_("Saturaton threshold"), "", false ) add_integer( CFG_PREFIX "similaritythres", 15, NULL, - _("Similarity threshold"), "", false ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + N_("Similarity threshold"), "", false ) + set_callbacks( Create, Destroy ) +vlc_module_end () -static const char *ppsz_filter_options[] = { - "color", "saturationthes", "similaritythres", NULL +static const char *const ppsz_filter_options[] = { + "color", "saturationthres", "similaritythres", NULL }; +/***************************************************************************** + * callback prototypes + *****************************************************************************/ +static int FilterCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + + /***************************************************************************** * filter_sys_t: adjust filter method descriptor *****************************************************************************/ struct filter_sys_t { + int i_simthres; + int i_satthres; + int i_color; + vlc_mutex_t lock; }; /***************************************************************************** @@ -96,19 +112,22 @@ struct filter_sys_t static int Create( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; - /* XXX: we might need to add/remove some FOURCCs ... */ - if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') - - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2') ) + switch( p_filter->fmt_in.video.i_chroma ) { - msg_Err( p_filter, "Unsupported input chroma (%4s)", - (char*)&(p_filter->fmt_in.video.i_chroma) ); - return VLC_EGENERIC; + CASE_PLANAR_YUV + p_filter->pf_video_filter = Filter; + break; + + CASE_PACKED_YUV_422 + p_filter->pf_video_filter = FilterPacked; + break; + + default: + msg_Err( p_filter, "Unsupported input chroma (%4.4s)", + (char*)&(p_filter->fmt_in.video.i_chroma) ); + return VLC_EGENERIC; } if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) @@ -117,21 +136,24 @@ static int Create( vlc_object_t *p_this ) return VLC_EGENERIC; } - config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, - p_filter->p_cfg ); - var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "color" ); - var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "similaritythres" ); - var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "saturationthres" ); - /* Allocate structure */ - p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); + p_sys = 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->pf_video_filter = Filter; + config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, + p_filter->p_cfg ); + p_sys->i_color = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "color" ); + p_sys->i_simthres = var_CreateGetIntegerCommand( p_filter, + CFG_PREFIX "similaritythres" ); + p_sys->i_satthres = var_CreateGetIntegerCommand( p_filter, + CFG_PREFIX "saturationthres" ); + + vlc_mutex_init( &p_sys->lock ); + + var_AddCallback( p_filter, CFG_PREFIX "color", FilterCallback, NULL ); + var_AddCallback( p_filter, CFG_PREFIX "similaritythres", FilterCallback, NULL ); + var_AddCallback( p_filter, CFG_PREFIX "saturationthres", FilterCallback, NULL ); return VLC_SUCCESS; } @@ -144,9 +166,41 @@ static int Create( vlc_object_t *p_this ) static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + + var_DelCallback( p_filter, CFG_PREFIX "color", FilterCallback, NULL ); + var_DelCallback( p_filter, CFG_PREFIX "similaritythres", FilterCallback, NULL ); + var_DelCallback( p_filter, CFG_PREFIX "saturationthres", FilterCallback, NULL ); + + vlc_mutex_destroy( &p_filter->p_sys->lock ); free( p_filter->p_sys ); } +static void GetReference( int *refu, int *refv, int *reflength, + uint32_t i_color ) +{ + int i_red = ( i_color & 0xFF0000 ) >> 16; + int i_green = ( i_color & 0x00FF00 ) >> 8; + int i_blue = ( i_color & 0x0000FF ); + int i_u = (int8_t)(( -38 * i_red - 74 * i_green + 112 * i_blue + 128) >> 8) + 128; + int i_v = (int8_t)(( 112 * i_red - 94 * i_green - 18 * i_blue + 128) >> 8) + 128; + *refu = i_u - 0x80; + *refv = i_v - 0x80; + *reflength = sqrt(*refu * *refu + *refv * *refv); +} + +static bool IsSimilar( int u, int v, + int refu, int refv, int reflength, + int i_satthres, int i_simthres ) +{ + int length = sqrt(u * u + v * v); + + int diffu = refu * length - u * reflength; + int diffv = refv * length - v * reflength; + int64_t difflen2 = diffu * diffu + diffv * diffv; + int64_t thres = length * reflength; + thres *= thres; + return length > i_satthres && (difflen2 * i_simthres < thres); +} /***************************************************************************** * Render: displays previously rendered output ***************************************************************************** @@ -157,89 +211,153 @@ static void Destroy( vlc_object_t *p_this ) static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; - uint8_t *p_in_y, *p_in_u, *p_in_v, *p_in_end_u; - uint8_t *p_out_y, *p_out_u, *p_out_v; - int i_simthres = var_GetInteger( p_filter, "colorthres-similaritythres" ); - int i_satthres = var_GetInteger( p_filter, "colorthres-saturationthres" ); - int i_color = var_GetInteger( p_filter, "colorthres-color" ); + filter_sys_t *p_sys = p_filter->p_sys; + + vlc_mutex_lock( &p_sys->lock ); + int i_simthres = p_sys->i_simthres; + int i_satthres = p_sys->i_satthres; + int i_color = p_sys->i_color; + vlc_mutex_unlock( &p_sys->lock ); 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; } - p_in_u = p_pic->p[U_PLANE].p_pixels; - p_in_v = p_pic->p[V_PLANE].p_pixels; - p_in_y = p_pic->p[Y_PLANE].p_pixels; - p_in_end_u = p_in_u + p_pic->p[U_PLANE].i_visible_lines - * p_pic->p[U_PLANE].i_pitch - 8; - - p_out_y = p_outpic->p[Y_PLANE].p_pixels; - p_out_u = p_outpic->p[U_PLANE].p_pixels; - p_out_v = p_outpic->p[V_PLANE].p_pixels; - - /* Create grayscale version of input */ - p_filter->p_libvlc-> - pf_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines - * p_pic->p[Y_PLANE].i_pitch - 8 ); - p_filter->p_libvlc-> - pf_memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines - * p_pic->p[U_PLANE].i_pitch - 8 ); - p_filter->p_libvlc-> - pf_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines - * p_pic->p[U_PLANE].i_pitch - 8 ); + /* Copy the Y plane */ + plane_CopyPixels( &p_outpic->p[Y_PLANE], &p_pic->p[Y_PLANE] ); /* * Do the U and V planes */ - int i_red = ( i_color & 0xFF0000 ) >> 16; - int i_green = ( i_color & 0xFF00 ) >> 8; - int i_blue = i_color & 0xFF; - int i_u = (int8_t)(( -38 * i_red - 74 * i_green + - 112 * i_blue + 128) >> 8) + 128; - int i_v = (int8_t)(( 112 * i_red - 94 * i_green - - 18 * i_blue + 128) >> 8) + 128; - int refu = i_u - 0x80; /*bright red*/ - int refv = i_v - 0x80; - int reflength = sqrt(refu*refu+refv*refv); - - while( p_in_u < p_in_end_u ) { - /* Length of color vector */ - int inu = (*p_in_u) - 0x80; - int inv = (*p_in_v) - 0x80; - int length = sqrt(inu*inu+inv*inv); - - int diffu = refu * length - inu *reflength; - int diffv = refv * length - inv *reflength; - long long int difflen2=diffu*diffu; - difflen2 +=diffv*diffv; - long long int thres = length*reflength; - thres *= thres; - if( length > i_satthres && (difflen2*i_simthres< thres ) ) { - *p_out_u = *p_in_u; - *p_out_v = *p_in_v; -// fprintf(stderr,"keeping color %d %d\n", length, difflen2); + int refu, refv, reflength; + GetReference( &refu, &refv, &reflength, i_color ); + + for( int y = 0; y < p_pic->p[U_PLANE].i_visible_lines; y++ ) + { + uint8_t *p_src_u = &p_pic->p[U_PLANE].p_pixels[y * p_pic->p[U_PLANE].i_pitch]; + uint8_t *p_src_v = &p_pic->p[V_PLANE].p_pixels[y * p_pic->p[V_PLANE].i_pitch]; + uint8_t *p_dst_u = &p_outpic->p[U_PLANE].p_pixels[y * p_outpic->p[U_PLANE].i_pitch]; + uint8_t *p_dst_v = &p_outpic->p[V_PLANE].p_pixels[y * p_outpic->p[V_PLANE].i_pitch]; + + for( int x = 0; x < p_pic->p[U_PLANE].i_visible_pitch; x++ ) + { + if( IsSimilar( *p_src_u - 0x80, *p_src_v - 0x80, + refu, refv, reflength, + i_satthres, i_simthres ) ) + + { + *p_dst_u++ = *p_src_u; + *p_dst_v++ = *p_src_v; + } + else + { + *p_dst_u++ = 0x80; + *p_dst_v++ = 0x80; + } + p_src_u++; + p_src_v++; + } + } + + return CopyInfoAndRelease( p_outpic, p_pic ); +} + +static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) +{ + picture_t *p_outpic; + filter_sys_t *p_sys = p_filter->p_sys; + + vlc_mutex_lock( &p_sys->lock ); + int i_simthres = p_sys->i_simthres; + int i_satthres = p_sys->i_satthres; + int i_color = p_sys->i_color; + vlc_mutex_unlock( &p_sys->lock ); + + if( !p_pic ) return NULL; + + p_outpic = filter_NewPicture( p_filter ); + if( !p_outpic ) + { + picture_Release( p_pic ); + return NULL; + } + + int i_y_offset, i_u_offset, i_v_offset; + int i_ret = GetPackedYuvOffsets( p_filter->fmt_in.video.i_chroma, + &i_y_offset, &i_u_offset, &i_v_offset ); + if( i_ret == VLC_EGENERIC ) + { + picture_Release( p_pic ); + return NULL; + } + + /* + * Copy Y and do the U and V planes + */ + int refu, refv, reflength; + GetReference( &refu, &refv, &reflength, i_color ); + + for( int y = 0; y < p_pic->p->i_visible_lines; y++ ) + { + uint8_t *p_src = &p_pic->p->p_pixels[y * p_pic->p->i_pitch]; + uint8_t *p_dst = &p_outpic->p->p_pixels[y * p_outpic->p->i_pitch]; + + for( int x = 0; x < p_pic->p->i_visible_pitch / 4; x++ ) + { + p_dst[i_y_offset + 0] = p_src[i_y_offset + 0]; + p_dst[i_y_offset + 2] = p_src[i_y_offset + 2]; + + if( IsSimilar( p_src[i_u_offset] - 0x80, p_src[i_v_offset] - 0x80, + refu, refv, reflength, + i_satthres, i_simthres ) ) + { + p_dst[i_u_offset] = p_src[i_u_offset]; + p_dst[i_v_offset] = p_src[i_v_offset]; + } + else + { + p_dst[i_u_offset] = 0x80; + p_dst[i_v_offset] = 0x80; + } + + p_dst += 4; + p_src += 4; } - p_in_u++; - p_in_v++; - p_out_u++; - p_out_v++; } - 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; + return CopyInfoAndRelease( p_outpic, p_pic ); +} - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); +static int FilterCallback ( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + (void)oldval; (void)p_data; + filter_t *p_filter = (filter_t*)p_this; + filter_sys_t *p_sys = p_filter->p_sys; - return p_outpic; + if( !strcmp( psz_var, CFG_PREFIX "color" ) ) + { + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_color = newval.i_int; + vlc_mutex_unlock( &p_sys->lock ); + } + else if( !strcmp( psz_var, CFG_PREFIX "similaritythres" ) ) + { + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_simthres = newval.i_int; + vlc_mutex_unlock( &p_sys->lock ); + } + else /* CFG_PREFIX "saturationthres" */ + { + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_satthres = newval.i_int; + vlc_mutex_unlock( &p_sys->lock ); + } + + return VLC_SUCCESS; }