Use %4.4s instead of %4s for fourccs cast to char *.

[vlc] / modules / video_filter / bluescreen.c

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 61f07a40e1f948c1d47ad69836f13d420efb4dd3..378219168dc021cd2f2df4da2998fe332f0e7e74 100644 (file)
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -31,9 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
-
-#include "vlc_filter.h"
+#include <vlc_filter.h>
 
 #define BLUESCREEN_HELP N_( \
     "This effect, also known as \"greenscreen\" or \"chroma key\" blends " \
@@ -103,6 +101,7 @@ static const char *const ppsz_filter_options[] = {
 
 struct filter_sys_t
 {
+    vlc_mutex_t lock;
     int i_u, i_v, i_ut, i_vt;
     uint8_t *p_at;
 };
@@ -112,10 +111,10 @@ static int Create( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
 
-    if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') )
+    if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Bluescreen can only use \"YUVA\".",
                  (char*)&p_filter->fmt_in.video.i_chroma );
         return VLC_EGENERIC;
@@ -130,9 +129,11 @@ static int Create( vlc_object_t *p_this )
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
+    int val;
+    vlc_mutex_init( &p_sys->lock );
 #define GET_VAR( name, min, max )                                           \
-    p_sys->i_##name = __MIN( max, __MAX( min,                               \
-        var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ) ) );      \
+    val = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name );        \
+    p_sys->i_##name = __MIN( max, __MAX( min, val ) );                      \
     var_AddCallback( p_filter, CFG_PREFIX #name, BluescreenCallback, p_sys );
 
     GET_VAR( u, 0x00, 0xff );
@@ -140,6 +141,7 @@ static int Create( vlc_object_t *p_this )
     GET_VAR( ut, 0x00, 0xff );
     GET_VAR( vt, 0x00, 0xff );
     p_sys->p_at = NULL;
+#undef GET_VAR
 
     p_filter->pf_video_filter = Filter;
 
@@ -149,9 +151,16 @@ 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;
+
+    var_DelCallback( p_filter, CFG_PREFIX "u", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "v", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "ut", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "vt", BluescreenCallback, p_sys );
 
-    free( p_filter->p_sys->p_at );
-    free( p_filter->p_sys );
+    free( p_sys->p_at );
+    vlc_mutex_destroy( &p_sys->lock );
+    free( p_sys );
 }
 
 static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
@@ -167,22 +176,25 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     uint8_t *p_v = p_pic->p[ V_PLANE ].p_pixels;
     uint8_t umin, umax, vmin, vmax;
 
-    if( p_pic->format.i_chroma != VLC_FOURCC('Y','U','V','A') )
+    if( p_pic->format.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Bluescreen can only use \"YUVA\".",
                  (char*)&p_pic->format.i_chroma );
         return NULL;
     }
 
-    p_sys->p_at = realloc( p_sys->p_at, i_lines * i_pitch * sizeof( uint8_t ) );
+    p_sys->p_at = xrealloc( p_sys->p_at,
+                            i_lines * i_pitch * sizeof( uint8_t ) );
     p_at = p_sys->p_at;
 
+    vlc_mutex_lock( &p_sys->lock );
     umin = p_sys->i_u - p_sys->i_ut >= 0x00 ? p_sys->i_u - p_sys->i_ut : 0x00;
     umax = p_sys->i_u + p_sys->i_ut <= 0xff ? p_sys->i_u + p_sys->i_ut : 0xff;
     vmin = p_sys->i_v - p_sys->i_vt >= 0x00 ? p_sys->i_v - p_sys->i_vt : 0x00;
     vmax = p_sys->i_v + p_sys->i_vt <= 0xff ? p_sys->i_v + p_sys->i_vt : 0xff;
+    vlc_mutex_unlock( &p_sys->lock );
 
     for( i = 0; i < i_lines*i_pitch; i++ )
     {
@@ -252,23 +264,17 @@ static int BluescreenCallback( vlc_object_t *p_this, char const *psz_var,
     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     filter_sys_t *p_sys = (filter_sys_t *) p_data;
 
+    vlc_mutex_lock( &p_sys->lock );
 #define VAR_IS( a ) !strcmp( psz_var, CFG_PREFIX a )
     if( VAR_IS( "u" ) )
-    {
         p_sys->i_u = __MAX( 0, __MIN( 255, newval.i_int ) );
-    }
     else if( VAR_IS( "v" ) )
-    {
         p_sys->i_v = __MAX( 0, __MIN( 255, newval.i_int ) );
-    }
     else if( VAR_IS( "ut" ) )
-    {
         p_sys->i_ut = __MAX( 0, __MIN( 255, newval.i_int ) );
-    }
     else if( VAR_IS( "vt" ) )
-    {
         p_sys->i_vt = __MAX( 0, __MIN( 255, newval.i_int ) );
-    }
+    vlc_mutex_unlock( &p_sys->lock );
 
     return VLC_SUCCESS;
 }