#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
-#include "vlc_filter.h"
+#include <vlc_filter.h>
#include "filter_picture.h"
#include "math.h"
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;
};
/*****************************************************************************
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;
}
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;
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 );
}
/*****************************************************************************
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;
return NULL;
}
+ vlc_mutex_lock( &p_sys->lock );
switch( p_pic->format.i_chroma )
{
case VLC_CODEC_I420:
case VLC_CODEC_J420:
case VLC_CODEC_YV12:
- switch( p_filter->p_sys->i_color )
+ switch( p_sys->i_color )
{
case RED:
get_red_from_yuv420( p_pic, p_outpic,
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;
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 );
}
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;
{
msg_Warn( p_this, "Unknown callback command." );
}
+ vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
}