X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fopencv_example.cpp;h=445e964f5dfa5ee50fd8ea765760eb7ae4fc3c2f;hb=97e6d8492866f2f94ca76a4fca8ea44c48890dec;hp=2c74ca60416579e3141c4f7309c36f76cda651d7;hpb=f485214f09dd284cbb85674e937fbbb0a6032a2e;p=vlc diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp index 2c74ca6041..445e964f5d 100644 --- a/modules/video_filter/opencv_example.cpp +++ b/modules/video_filter/opencv_example.cpp @@ -1,5 +1,5 @@ /***************************************************************************** - * opencv_example.cpp : Example OpenCV internal video filter + * opencv_example.cpp : Example OpenCV internal video filter * (performs face identification). Mostly taken from the facedetect.c * OpenCV sample. ***************************************************************************** @@ -30,11 +30,16 @@ #include -#include -#include -#include "vlc_filter.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include #include "filter_common.h" -#include "vlc_image.h" +#include #include "filter_event_info.h" /***************************************************************************** @@ -59,20 +64,20 @@ static picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("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 ); +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 ) 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_("Haar cascade filename"), + N_("Name of XML file containing Haar cascade description"), false); +vlc_module_end () /***************************************************************************** * OpenFilter: probe the filter and return score @@ -86,11 +91,10 @@ 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 + + //init the video_filter_event_info_t struct p_sys->event_info.i_region_size = 0; p_sys->event_info.p_region = NULL; p_sys->i_id = 0; @@ -99,17 +103,18 @@ 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_global, 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); - + 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", VIDEO_FILTER_EVENT_VARIABLE); + val.p_address = &(p_sys->event_info); - if (var_Set( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS) - msg_Err( p_filter, "Could not set %s\n", VIDEO_FILTER_EVENT_VARIABLE); + if (var_Set( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE, val )!=VLC_SUCCESS) + 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; } @@ -121,26 +126,24 @@ 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_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); - + free( p_filter->p_sys->event_info.p_region ); free( p_sys ); - var_Destroy( p_filter->p_libvlc_global, VIDEO_FILTER_EVENT_VARIABLE); + var_Destroy( p_filter->p_libvlc, VIDEO_FILTER_EVENT_VARIABLE); } /**************************************************************************** * Filter: Check for faces and raises an event when one is found. **************************************************************************** - * p_pic: A picture_t with its p_data_orig member set to an array of - * IplImages (one image for each picture_t plane). + * p_pic: A picture_t with its p_data_orig member set to an array of + * IplImages (one image for each picture_t plane). ****************************************************************************/ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { @@ -148,7 +151,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) int i_planes = 0; CvPoint pt1, pt2; int i, scale = 1; - + if ((!p_pic) ) { msg_Err( p_filter, "no image array" ); @@ -169,7 +172,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) msg_Err( p_filter, "no image" ); return NULL; } - if ((p_pic->format.i_chroma != VLC_FOURCC('I','4','2','0'))) + if ((p_pic->format.i_chroma != VLC_CODEC_I420)) { msg_Err( p_filter, "wrong chroma - use I420" ); return NULL; @@ -182,27 +185,23 @@ 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; + CvSeq* faces = NULL; if( p_filter->p_sys->p_cascade ) { //we should make some of these params config variables - faces = cvHaarDetectObjects( p_img[0], p_filter->p_sys->p_cascade, + 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, 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)\n", 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; - } + //msg_Dbg( p_filter, "Found %d face(s)", faces->total ); + 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)))) { - 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,11 +224,11 @@ 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_global, 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?" ); - + return p_pic; }