OpenCV: more cosmetics.

[vlc] / modules / video_filter / opencv_example.cpp

diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 3d899e55d3e315ef063acc5e413b6e211be1d71e..906ed857f8f1f00195322ff806078ae6c1f057f3 100644 (file)
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -25,10 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -42,6 +38,9 @@
 #include <vlc_image.h>
 #include "filter_event_info.h"
 
+#include <cxcore.h>
+#include <cv.h>
+
 /*****************************************************************************
  * filter_sys_t : filter descriptor
  *****************************************************************************/
@@ -111,9 +110,9 @@ static int OpenFilter( vlc_object_t *p_this )
         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);
+    char* filename = var_InheritString( p_filter, "opencv-haarcascade-file" );
+    p_sys->p_cascade = (CvHaarClassifierCascade*)cvLoad( filename, 0, 0, 0 );
+    p_sys->p_storage = cvCreateMemStorage(0);
     free( filename );
 
     return VLC_SUCCESS;
@@ -127,15 +126,13 @@ static void CloseFilter( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t*)p_this;
     filter_sys_t *p_sys = p_filter->p_sys;
 
-    if( p_filter->p_sys->p_cascade )
-        cvReleaseHaarClassifierCascade( &p_filter->p_sys->p_cascade );
+    if( p_sys->p_cascade )
+        cvReleaseHaarClassifierCascade( &p_sys->p_cascade );
 
-    if( p_filter->p_sys->p_storage )
-        cvReleaseMemStorage( &p_filter->p_sys->p_storage );
-
-    if (NULL != p_filter->p_sys->event_info.p_region)
-        free(p_filter->p_sys->event_info.p_region);
+    if( p_sys->p_storage )
+        cvReleaseMemStorage( &p_sys->p_storage );
 
+    free( p_sys->event_info.p_region );
     free( p_sys );
 
     var_Destroy( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE);
@@ -153,6 +150,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     int i_planes = 0;
     CvPoint pt1, pt2;
     int i, scale = 1;
+    filter_sys_t *p_sys = p_filter->p_sys;
  
     if ((!p_pic) )
     {
@@ -186,46 +184,39 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     }
 
     //perform face detection
-    cvClearMemStorage(p_filter->p_sys->p_storage);
-    CvSeq* faces = NULL;
-    if( p_filter->p_sys->p_cascade )
+    cvClearMemStorage(p_sys->p_storage);
+    if( p_sys->p_cascade )
     {
         //we should make some of these params config variables
-        faces = cvHaarDetectObjects( p_img[0], p_filter->p_sys->p_cascade,
-            p_filter->p_sys->p_storage, 1.15, 5, CV_HAAR_DO_CANNY_PRUNING,
+        CvSeq *faces = cvHaarDetectObjects( p_img[0], p_sys->p_cascade,
+                                            p_sys->p_storage, 1.15, 5,
+                                            CV_HAAR_DO_CANNY_PRUNING,
                                             cvSize(20, 20) );
         //create the video_filter_region_info_t struct
-        CvRect* r;
         if (faces && (faces->total > 0))
         {
             //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);
-                p_filter->p_sys->event_info.p_region = NULL;
-            }
-            if( NULL == ( p_filter->p_sys->event_info.p_region =
-                  (video_filter_region_info_t *)malloc(faces->total*sizeof(video_filter_region_info_t))))
-            {
+            free( p_sys->event_info.p_region );
+            p_sys->event_info.p_region = (video_filter_region_info_t*)
+                    calloc( faces->total, sizeof(video_filter_region_info_t));
+            if( !p_sys->event_info.p_region )
                 return NULL;
-            }
-            memset(p_filter->p_sys->event_info.p_region, 0, faces->total*sizeof(video_filter_region_info_t));
-            p_filter->p_sys->event_info.i_region_size = faces->total;
+            p_sys->event_info.i_region_size = faces->total;
         }
 
         //populate the video_filter_region_info_t struct
         for( i = 0; i < (faces ? faces->total : 0); i++ )
         {
-            r = (CvRect*)cvGetSeqElem( faces, i );
+            CvRect *r = (CvRect*)cvGetSeqElem( faces, i );
             pt1.x = r->x*scale;
             pt2.x = (r->x+r->width)*scale;
             pt1.y = r->y*scale;
             pt2.y = (r->y+r->height)*scale;
             cvRectangle( p_img[0], pt1, pt2, CV_RGB(0,0,0), 3, 8, 0 );
 
-            *(CvRect*)(&(p_filter->p_sys->event_info.p_region[i])) = *r;
-            p_filter->p_sys->event_info.p_region[i].i_id = p_filter->p_sys->i_id++;
-            p_filter->p_sys->event_info.p_region[i].p_description = "Face Detected";
+            *(CvRect*)(&(p_sys->event_info.p_region[i])) = *r;
+            p_sys->event_info.p_region[i].i_id = p_sys->i_id++;
+            p_sys->event_info.p_region[i].p_description = "Face Detected";
         }
 
         if (faces && (faces->total > 0))    //raise the video filter event