mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-24 23:16:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

faceoverlay: move face handling into own function and handle 0 face count

Browse source 
When a face disappears, we seem to get a message from facedetect with
a face count of 0, which we want to just ignore instead of trying to
access face #-1, which causes nasty warnings.
This commit is contained in:
Tim-Philipp Müller 2012-03-15 17:47:58 +00:00
parent 55b0f1e601
commit 549447d288
1 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/faceoverlay/gstfaceoverlay.c
View file

@ -190,34 +190,34 @@ gst_face_overlay_change_state (GstElement * element, GstStateChange transition)
} }
static void static void
gst_face_overlay_message_handler (GstBin * bin, GstMessage * message) gst_face_overlay_handle_faces (GstFaceOverlay * filter, GstStructure * s)
{ {
if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ELEMENT &&
strcmp (gst_structure_get_name (message->structure), "facedetect") == 0) {
GstFaceOverlay *filter = GST_FACEOVERLAY (bin);
/* optionally draw the image once every two messages for better performance
* filter->process_message = !filter->process_message;
* if(!filter->process_message)
* return;
*/
guint x, y, width, height; guint x, y, width, height;
int delta_x, delta_y, svg_x, svg_y, svg_width, svg_height; int delta_x, delta_y, svg_x, svg_y, svg_width, svg_height;
const GstStructure *face; const GstStructure *face;
const GValue *faces_list, *face_val;
int face_count; int face_count;
face_count = #if 0
gst_value_list_get_size (gst_structure_get_value (message->structure, /* optionally draw the image once every two messages for better performance */
"faces")); filter->process_message = !filter->process_message;
if (!filter->process_message)
return;
#endif
faces_list = gst_structure_get_value (s, "faces");
face_count = gst_value_list_get_size (faces_list);
GST_LOG_OBJECT (filter, "face count: %d", face_count);
/* FIXME: should we clear the overlay in this case? */
if (face_count == 0)
return;
/* The last face in the list seems to be the right one, objects mistakenly /* The last face in the list seems to be the right one, objects mistakenly
* detected as faces for a couple of frames seem to be in the list * detected as faces for a couple of frames seem to be in the list
* beginning. TODO: needs confirmation. */ * beginning. TODO: needs confirmation. */
face = face_val = gst_value_list_get_value (faces_list, face_count - 1);
gst_value_get_structure (gst_value_list_get_value face = gst_value_get_structure (face_val);
(gst_structure_get_value (message->structure, "faces"),
face_count - 1));
gst_structure_get_uint (face, "x", &x); gst_structure_get_uint (face, "x", &x);
gst_structure_get_uint (face, "y", &y); gst_structure_get_uint (face, "y", &y);
gst_structure_get_uint (face, "width", &width); gst_structure_get_uint (face, "width", &width);
@ -237,10 +237,20 @@ gst_face_overlay_message_handler (GstBin * bin, GstMessage * message)
svg_width = (int) width *filter->w; svg_width = (int) width *filter->w;
svg_height = (int) height *filter->h; svg_height = (int) height *filter->h;
GST_LOG_OBJECT (filter, "setting overlay to %d x %d @ %d,%d (file: %s)",
svg_width, svg_height, svg_x, svg_y, GST_STR_NULL (filter->location));
g_object_set (filter->svg_overlay, g_object_set (filter->svg_overlay,
"location", filter->location, "location", filter->location,
"x", svg_x, "y", svg_y, "width", svg_width, "height", svg_height, NULL); "x", svg_x, "y", svg_y, "width", svg_width, "height", svg_height, NULL);
}
static void
gst_face_overlay_message_handler (GstBin * bin, GstMessage * message)
{
if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ELEMENT &&
gst_structure_has_name (message->structure, "facedetect")) {
gst_face_overlay_handle_faces (GST_FACEOVERLAY (bin), message->structure);
} }
GST_BIN_CLASS (parent_class)->handle_message (bin, message); GST_BIN_CLASS (parent_class)->handle_message (bin, message);