mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-18 00:12:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'analytics-overlay-improvements' into 'main'

Browse source 
Analytics overlay: Add lingering mode and no-draw properties

See merge request gstreamer/gstreamer!6799
This commit is contained in:
Olivier Crête 2024-05-03 20:27:02 +00:00
parent 73c64e8182 6a98601b7c
commit 1ce60c2f1a
1 changed files with 73 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
subprojects/gst-plugins-bad/ext/analyticsoverlay/gstobjectdetectionoverlay.c
View file

@ -67,14 +67,18 @@ struct _GstObjectDetectionOverlay
GMutex stream_event_mutex;
gboolean flushing;
gboolean eos;
guint linger_count;
GstBuffer *lingered_buffer;
/* properties */
guint od_outline_color;
guint od_outline_stroke_width;
gboolean draw_labels;
gboolean draw;
guint labels_color;
gdouble labels_stroke_width;
gdouble labels_outline_ofs;
guint linger;
/* composition */
gboolean attach_compo_to_buffer;
@ -100,6 +104,8 @@ enum
PROP_OD_OUTLINE_COLOR = 1,
PROP_DRAW_LABELS,
PROP_LABELS_COLOR,
PROP_DRAW,
PROP_LINGER,
_PROP_COUNT
};
@ -228,6 +234,34 @@ gst_object_detection_overlay_class_init (GstObjectDetectionOverlayClass * klass)
"Color (ARGB) to use for object labels",
0, G_MAXUINT, 0xFFFFFF, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstObjectDetectionOverlay:draw
*
* Control drawing objects
*
* Since: 1.26
*/
g_object_class_install_property (gobject_class, PROP_DRAW,
g_param_spec_boolean ("draw",
"Draw",
"Draw objects",
TRUE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS |
GST_PARAM_MUTABLE_PLAYING));
/**
* GstObjectDetectionOverlay:linger
*
* Linger labels for n frames without updated metadata
*
* Since: 1.26
*/
g_object_class_install_property (gobject_class, PROP_LINGER,
g_param_spec_uint ("linger",
"Linger",
"Linger labels for n frames without updated metadata",
0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
element_class = (GstElementClass *) klass;
gst_element_class_add_static_pad_template (element_class, &sink_template);
@ -281,6 +315,7 @@ gst_object_detection_overlay_init (GstObjectDetectionOverlay * overlay)
overlay->pango_layout = NULL;
overlay->od_outline_color = 0xFFFFFFFF;
overlay->draw_labels = TRUE;
overlay->draw = TRUE;
overlay->labels_color = 0xFFFFFFFF;
overlay->in_info = &GST_VIDEO_FILTER (overlay)->in_info;
overlay->attach_compo_to_buffer = TRUE;
@ -311,6 +346,12 @@ gst_object_detection_overlay_set_property (GObject * object, guint prop_id,
case PROP_LABELS_COLOR:
overlay->labels_color = g_value_get_uint (value);
break;
case PROP_DRAW:
overlay->draw = g_value_get_boolean (value);
break;
case PROP_LINGER:
overlay->linger = g_value_get_uint (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -333,6 +374,12 @@ gst_object_detection_overlay_get_property (GObject * object,
case PROP_LABELS_COLOR:
g_value_set_uint (value, od_overlay->labels_color);
break;
case PROP_DRAW:
g_value_set_boolean (value, od_overlay->draw);
break;
case PROP_LINGER:
g_value_set_uint (value, od_overlay->linger);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -546,6 +593,8 @@ gst_object_detection_overlay_sink_event (GstBaseTransform * trans,
GstCaps *caps;
gst_event_parse_caps (event, &caps);
ret = gst_object_detection_overlay_setcaps (overlay, caps);
gst_clear_buffer (&overlay->lingered_buffer);
overlay->linger_count = 0;
gst_event_unref (event);
break;
}
@ -553,6 +602,8 @@ gst_object_detection_overlay_sink_event (GstBaseTransform * trans,
g_mutex_lock (&overlay->stream_event_mutex);
GST_INFO_OBJECT (overlay, "EOS");
overlay->eos = TRUE;
gst_clear_buffer (&overlay->lingered_buffer);
overlay->linger_count = 0;
g_mutex_unlock (&overlay->stream_event_mutex);
break;
case GST_EVENT_FLUSH_START:
@ -566,6 +617,8 @@ gst_object_detection_overlay_sink_event (GstBaseTransform * trans,
GST_INFO_OBJECT (overlay, "Flush stop");
overlay->eos = FALSE;
overlay->flushing = FALSE;
gst_clear_buffer (&overlay->lingered_buffer);
overlay->linger_count = 0;
g_mutex_unlock (&overlay->stream_event_mutex);
break;
default:
@ -606,6 +659,8 @@ gst_object_detection_overlay_stop (GstBaseTransform * trans)
{
GstObjectDetectionOverlay *overlay = GST_OBJECT_DETECTION_OVERLAY (trans);
gst_clear_buffer (&overlay->lingered_buffer);
overlay->linger_count = 0;
g_clear_object (&overlay->pango_layout);
g_clear_object (&overlay->pango_context);
gst_clear_buffer (&overlay->canvas);
@ -688,6 +743,9 @@ gst_object_detection_overlay_transform_frame_ip (GstVideoFilter * filter,
}
g_mutex_unlock (&overlay->stream_event_mutex);
if (overlay->draw == FALSE)
return GST_FLOW_OK;
composition_meta =
gst_buffer_get_video_overlay_composition_meta (frame->buffer);
if (composition_meta) {
@ -703,6 +761,21 @@ gst_object_detection_overlay_transform_frame_ip (GstVideoFilter * filter,
gst_buffer_get_meta (GST_BUFFER (frame->buffer),
GST_ANALYTICS_RELATION_META_API_TYPE);
if (rmeta) {
overlay->linger_count = 0;
if (overlay->linger)
gst_buffer_replace (&overlay->lingered_buffer, frame->buffer);
} else if (overlay->lingered_buffer) {
overlay->linger_count++;
if (overlay->linger_count > overlay->linger)
gst_clear_buffer (&overlay->lingered_buffer);
else
rmeta = (GstAnalyticsRelationMeta *)
gst_buffer_get_meta (overlay->lingered_buffer,
GST_ANALYTICS_RELATION_META_API_TYPE);
}
if (rmeta) {
GST_DEBUG_OBJECT (filter, "received buffer with analytics relation meta");