X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fopencv_example.cpp;h=310e16f717762bfe704ee4eb4d2e60b3013adcbd;hb=bb208df0ee8f5aad14e0304ea978d1118bfe5d63;hp=66ff608164f756351aa09569e2180c0d2234824a;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 66ff608164..310e16f717 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -30,8 +30,12 @@
 #include <highgui.h>
 
 
-#include <vlc/vlc.h>
-#include <vlc_decoder.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_filter.h>
 #include "filter_common.h"
 #include <vlc_image.h>
@@ -59,20 +63,20 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("OpenCV face detection example filter") );
-    set_shortname( _( "OpenCV example" ));
-    set_capability( "opencv example", 1 );
-    add_shortcut( "opencv_example" );
+vlc_module_begin ()
+    set_description( N_("OpenCV face detection example filter") )
+    set_shortname( N_( "OpenCV example" ))
+    set_capability( "opencv example", 1 )
+    add_shortcut( "opencv_example" )
 
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
-    set_callbacks( OpenFilter, CloseFilter );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER2 )
+    set_callbacks( OpenFilter, CloseFilter )
 
     add_string( "opencv-haarcascade-file", "c:\\haarcascade_frontalface_alt.xml", NULL,
                           N_("Haar cascade filename"),
-                          N_("Name of XML file containing Haar cascade description"), VLC_FALSE);
-vlc_module_end();
+                          N_("Name of XML file containing Haar cascade description"), false);
+vlc_module_end ()
 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score
@@ -86,8 +90,7 @@ static int OpenFilter( vlc_object_t *p_this )
     if( ( p_filter->p_sys = p_sys =
           (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
     {
-        msg_Err( p_filter, "out of memory" );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
     //init the video_filter_event_info_t struct
@@ -100,16 +103,17 @@ static int OpenFilter( vlc_object_t *p_this )
     //create the VIDEO_FILTER_EVENT_VARIABLE
     vlc_value_t val;
     if (var_Create( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_ADDRESS | VLC_VAR_DOINHERIT ) != VLC_SUCCESS)
-        msg_Err( p_filter, "Could not create %s\n", VIDEO_FILTER_EVENT_VARIABLE);
+        msg_Err( p_filter, "Could not create %s", VIDEO_FILTER_EVENT_VARIABLE);
 
     val.p_address = &(p_sys->event_info);
     if (var_Set( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS)
-        msg_Err( p_filter, "Could not set %s\n", VIDEO_FILTER_EVENT_VARIABLE);
+        msg_Err( p_filter, "Could not set %s", VIDEO_FILTER_EVENT_VARIABLE);
 
     //OpenCV init specific to this example
     char* filename = config_GetPsz( p_filter, "opencv-haarcascade-file" );
     p_filter->p_sys->p_cascade = (CvHaarClassifierCascade*)cvLoad( filename, 0, 0, 0 );
     p_filter->p_sys->p_storage = cvCreateMemStorage(0);
+    free( filename );
 
     return VLC_SUCCESS;
 }
@@ -193,7 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         CvRect* r;
         if (faces && (faces->total > 0))
         {
-            //msg_Dbg( p_filter, "Found %d face(s)\n", faces->total );
+            //msg_Dbg( p_filter, "Found %d face(s)", faces->total );
             if (NULL != p_filter->p_sys->event_info.p_region)
             {
                 free(p_filter->p_sys->event_info.p_region);
@@ -202,7 +206,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             if( NULL == ( p_filter->p_sys->event_info.p_region =
                   (video_filter_region_info_t *)malloc(faces->total*sizeof(video_filter_region_info_t))))
             {
-                msg_Err( p_filter, "out of memory" );
                 return NULL;
             }
             memset(p_filter->p_sys->event_info.p_region, 0, faces->total*sizeof(video_filter_region_info_t));
@@ -225,7 +228,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
 
         if (faces && (faces->total > 0))    //raise the video filter event
-            var_Change( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+            var_TriggerCallback( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE );
     }
     else
         msg_Err( p_filter, "No cascade - is opencv-haarcascade-file valid?" );