X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fextract.c;h=d1d2e2acbce3b32ee33da250ba8176a831767843;hb=HEAD;hp=7c78400c8752de71e86ab6c15603aac88b383458;hpb=5d3c921b102e46e416c8e1169d8ac604a8654ac1;p=vlc diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index 7c78400c87..d1d2e2acbc 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,24 +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" ); 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,22 +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) ); picture_Release( p_pic ); return NULL; } + vlc_mutex_unlock( &p_sys->lock ); return CopyInfoAndRelease( p_outpic, p_pic ); } @@ -325,19 +330,19 @@ static void get_custom_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; - y2in = y1in + i_pitch; - y2out = y1out + i_pitch; + y2in = y1in + i_in_pitch; + y2out = y1out + i_out_pitch; while( y1in < y1end ) { *uout++ = crop( (*y1in * m[3] + (*uin-U) * m[4] + (*vin-V) * m[5]) @@ -353,12 +358,12 @@ static void get_custom_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, *y2out++ = crop( (*y2in++ * m[0] + (*uin++ - U) * m[1] + (*vin++ -V) * m[2]) / 65536 ); } - y1in += 2*i_pitch - i_visible_pitch; - y1out += 2*i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += 2*i_in_pitch - i_visible_pitch; + y1out += 2*i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } static void get_custom_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, @@ -372,14 +377,14 @@ static void get_custom_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; @@ -394,12 +399,12 @@ static void get_custom_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, *y1out++ = crop( (*y1in++ * m[0] + (*uin++ -U) * m[1] + (*vin++ -V) * m[2]) / 65536 ); } - y1in += i_pitch - i_visible_pitch; - y1out += i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += i_in_pitch - i_visible_pitch; + y1out += i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -420,11 +425,12 @@ static void get_custom_from_packedyuv422( picture_t *p_inpic, uint8_t *uout = p_outpic->p->p_pixels + i_u_offset; uint8_t *vout = p_outpic->p->p_pixels + i_v_offset; - const int i_pitch = p_inpic->p->i_pitch; + const int i_in_pitch = p_inpic->p->i_pitch; + const int i_out_pitch = p_outpic->p->i_pitch; const int i_visible_pitch = p_inpic->p->i_visible_pitch; const int i_visible_lines = p_inpic->p->i_visible_lines; - const uint8_t *yend = yin + i_visible_lines * i_pitch; + const uint8_t *yend = yin + i_visible_lines * i_in_pitch; while( yin < yend ) { const uint8_t *ylend = yin + i_visible_pitch; @@ -447,12 +453,12 @@ static void get_custom_from_packedyuv422( picture_t *p_inpic, uin += 4; vin += 4; } - yin += i_pitch - i_visible_pitch; - yout += i_pitch - i_visible_pitch; - uin += i_pitch - i_visible_pitch; - uout += i_pitch - i_visible_pitch; - vin += i_pitch - i_visible_pitch; - vout += i_pitch - i_visible_pitch; + yin += i_in_pitch - i_visible_pitch; + yout += i_out_pitch - i_visible_pitch; + uin += i_in_pitch - i_visible_pitch; + uout += i_out_pitch - i_visible_pitch; + vin += i_in_pitch - i_visible_pitch; + vout += i_out_pitch - i_visible_pitch; } } @@ -468,19 +474,19 @@ static void get_red_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; - y2in = y1in + i_pitch; - y2out = y1out + i_pitch; + y2in = y1in + i_in_pitch; + y2out = y1out + i_out_pitch; while( y1in < y1end ) { /* @@ -501,11 +507,11 @@ static void get_red_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, *y2out++ = crop( (*y2in++ * 19594 + (*vin++ - V) * 27473) / 65536 ); } - y1in += 2*i_pitch - i_visible_pitch; - y1out += 2*i_pitch - i_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += 2*i_in_pitch - i_visible_pitch; + y1out += 2*i_out_pitch - i_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -522,19 +528,20 @@ static void get_green_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; - y2in = y1in + i_pitch; - y2out = y1out + i_pitch; + y2in = y1in + i_in_pitch; + y2out = y1out + i_out_pitch; while( y1in < y1end ) { /* @@ -555,12 +562,12 @@ static void get_green_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, *y2out++ = crop( (*y2in++ * 38470 + (*uin++ - U) * -13239 + (*vin++ -V) * -27473) / 65536 ); } - y1in += 2*i_pitch - i_visible_pitch; - y1out += 2*i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += 2*i_in_pitch - i_visible_pitch; + y1out += 2*i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -576,19 +583,19 @@ static void get_blue_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; - y2in = y1in + i_pitch; - y2out = y1out + i_pitch; + y2in = y1in + i_in_pitch; + y2out = y1out + i_out_pitch; while( y1in < y1end ) { /* @@ -609,11 +616,11 @@ static void get_blue_from_yuv420( picture_t *p_inpic, picture_t *p_outpic, *y2out++ = crop( (*y2in++ * 7471 + (*uin++ - U) * 13239 ) / 65536 ); } - y1in += 2*i_pitch - i_visible_pitch; - y1out += 2*i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += 2*i_in_pitch - i_visible_pitch; + y1out += 2*i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vout += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -627,14 +634,14 @@ static void get_red_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_inpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; @@ -654,11 +661,11 @@ static void get_red_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, *y1out++ = crop( (*y1in++ * 19595 + (*vin++ - V) * 27473) / 65536 ); } - y1in += i_pitch - i_visible_pitch; - y1out += i_pitch - i_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += i_in_pitch - i_visible_pitch; + y1out += i_out_pitch - i_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -673,14 +680,14 @@ static void get_green_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; @@ -700,12 +707,12 @@ static void get_green_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, *y1out++ = crop( (*y1in++ * 38470 + (*uin++-U) * -13239 + (*vin++-V) * -27473) / 65536 ); } - y1in += i_pitch - i_visible_pitch; - y1out += i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vin += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += i_in_pitch - i_visible_pitch; + y1out += i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vin += p_inpic->p[vp].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -719,14 +726,14 @@ static void get_blue_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, uint8_t *uout = p_outpic->p[up].p_pixels; uint8_t *vout = p_outpic->p[vp].p_pixels; - const int i_pitch = p_inpic->p[yp].i_pitch; + const int i_in_pitch = p_inpic->p[yp].i_pitch; + const int i_out_pitch = p_outpic->p[yp].i_pitch; + const int i_visible_pitch = p_inpic->p[yp].i_visible_pitch; const int i_visible_lines = p_inpic->p[yp].i_visible_lines; - - const int i_uv_pitch = p_inpic->p[up].i_pitch; const int i_uv_visible_pitch = p_inpic->p[up].i_visible_pitch; - const uint8_t *yend = y1in + i_visible_lines * i_pitch; + const uint8_t *yend = y1in + i_visible_lines * i_in_pitch; while( y1in < yend ) { const uint8_t *y1end = y1in + i_visible_pitch; @@ -746,11 +753,11 @@ static void get_blue_from_yuv422( picture_t *p_inpic, picture_t *p_outpic, *y1out++ = crop( (*y1in++ * 7471 + (*uin++ - U) * 13239 ) / 65536 ); } - y1in += i_pitch - i_visible_pitch; - y1out += i_pitch - i_visible_pitch; - uin += i_uv_pitch - i_uv_visible_pitch; - uout += i_uv_pitch - i_uv_visible_pitch; - vout += i_uv_pitch - i_uv_visible_pitch; + y1in += i_in_pitch - i_visible_pitch; + y1out += i_out_pitch - i_visible_pitch; + uin += p_inpic->p[up].i_pitch - i_uv_visible_pitch; + uout += p_outpic->p[up].i_pitch - i_uv_visible_pitch; + vout += p_outpic->p[vp].i_pitch - i_uv_visible_pitch; } } @@ -761,6 +768,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; @@ -772,5 +780,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; }