mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 23:48:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: define CASCADE_DO_CANNY_PRUNING for opencv < 4

Browse source
This commit is contained in:
Nicola Murino 2018-11-25 20:27:25 +01:00 committed by Nicolas Dufresne
parent b0773c6ea7
commit 24d5c9b200
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/opencv/gsthanddetect.cpp
View file

@ -69,6 +69,9 @@
GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug); GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug);
#define GST_CAT_DEFAULT gst_handdetect_debug #define GST_CAT_DEFAULT gst_handdetect_debug
#if (CV_MAJOR_VERSION < 4)
#define CASCADE_DO_CANNY_PRUNING CV_HAAR_DO_CANNY_PRUNING
#endif
/* define HAAR files */ /* define HAAR files */
#define HAAR_FILE_FIST GST_HAAR_CASCADES_DIR G_DIR_SEPARATOR_S "fist.xml" #define HAAR_FILE_FIST GST_HAAR_CASCADES_DIR G_DIR_SEPARATOR_S "fist.xml"
@ -413,13 +416,8 @@ gst_handdetect_transform_ip (GstOpencvVideoFilter * transform,
Mat roi (image, Rect (filter->cvGray->origin, Mat roi (image, Rect (filter->cvGray->origin,
filter->cvGray->origin, filter->cvGray->width, filter->cvGray->origin, filter->cvGray->width,
filter->cvGray->height)); filter->cvGray->height));
#if (CV_MAJOR_VERSION >= 4)
filter->cvCascade_fist->detectMultiScale (roi, hands, 1.1, 2, filter->cvCascade_fist->detectMultiScale (roi, hands, 1.1, 2,
CASCADE_DO_CANNY_PRUNING, cvSize (24, 24), cvSize (0, 0)); CASCADE_DO_CANNY_PRUNING, cvSize (24, 24), cvSize (0, 0));
#else
filter->cvCascade_fist->detectMultiScale (roi, hands, 1.1, 2,
CV_HAAR_DO_CANNY_PRUNING, cvSize (24, 24), cvSize (0, 0));
#endif
/* if FIST gesture detected */ /* if FIST gesture detected */
if (!hands.empty ()) { if (!hands.empty ()) {