mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 00:58:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix the profile parameter in the facedetect element to accept a string correctly

Browse source
This commit is contained in:
Mike Sheldon 2009-05-06 15:49:42 +01:00 committed by Thiago Santos
parent 4b9ae0088b
commit 2f77a06d23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/opencv/facedetect/gstfacedetect.c
View file

@ -112,7 +112,7 @@ static void gst_facedetect_get_property (GObject * object, guint prop_id,
static gboolean gst_facedetect_set_caps (GstPad * pad, GstCaps * caps); static gboolean gst_facedetect_set_caps (GstPad * pad, GstCaps * caps);
static GstFlowReturn gst_facedetect_chain (GstPad * pad, GstBuffer * buf); static GstFlowReturn gst_facedetect_chain (GstPad * pad, GstBuffer * buf);
static void gst_facedetect_load_profile (GObject * object); static void gst_facedetect_load_profile (Gstfacedetect * filter);
/* Clean up */ /* Clean up */
static void static void
@ -167,8 +167,8 @@ gst_facedetect_class_init (GstfacedetectClass * klass)
g_param_spec_boolean ("display", "Display", "Sets whether the detected faces should be highlighted in the output", g_param_spec_boolean ("display", "Display", "Sets whether the detected faces should be highlighted in the output",
TRUE, G_PARAM_READWRITE)); TRUE, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_PROFILE, g_object_class_install_property (gobject_class, PROP_PROFILE,
g_param_spec_char ("profile", "Profile", "Location of Haar cascade file to use for face detection", g_param_spec_string ("profile", "Profile", "Location of Haar cascade file to use for face detection",
G_MININT8, G_MAXINT8, DEFAULT_PROFILE, G_PARAM_READWRITE)); DEFAULT_PROFILE, G_PARAM_READWRITE));
} }
/* initialize the new element /* initialize the new element
@ -207,7 +207,7 @@ gst_facedetect_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_PROFILE: case PROP_PROFILE:
filter->profile = g_value_get_char (value); filter->profile = g_value_dup_string (value);
gst_facedetect_load_profile(filter); gst_facedetect_load_profile(filter);
break; break;
case PROP_DISPLAY: case PROP_DISPLAY:
@ -227,7 +227,7 @@ gst_facedetect_get_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_PROFILE: case PROP_PROFILE:
g_value_set_char (value, filter->profile); g_value_take_string (value, filter->profile);
break; break;
case PROP_DISPLAY: case PROP_DISPLAY:
g_value_set_boolean (value, filter->display); g_value_set_boolean (value, filter->display);
@ -315,9 +315,7 @@ gst_facedetect_chain (GstPad * pad, GstBuffer * buf)
} }
static void gst_facedetect_load_profile(GObject * object) { static void gst_facedetect_load_profile(Gstfacedetect * filter) {
Gstfacedetect *filter = GST_FACEDETECT (object);
filter->cvCascade = (CvHaarClassifierCascade*)cvLoad(filter->profile, 0, 0, 0 ); filter->cvCascade = (CvHaarClassifierCascade*)cvLoad(filter->profile, 0, 0, 0 );
if (!filter->cvCascade) { if (!filter->cvCascade) {
GST_WARNING ("Couldn't load Haar classifier cascade: %s.", filter->profile); GST_WARNING ("Couldn't load Haar classifier cascade: %s.", filter->profile);