mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-03 05:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'ssdobjectdetector-size-threshold' into 'main'

Browse source 
ssdobjectdetector: Add size threshold to drop too big detections

See merge request gstreamer/gstreamer!6810
This commit is contained in:
Olivier Crête 2024-05-17 23:48:36 +00:00
parent 5be3f255b0 87ec3bd399
commit 86095be0c4
2 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
subprojects/gst-plugins-bad/ext/onnx/decoders/gstssdobjectdetector.c
View file

@ -70,9 +70,11 @@ enum
PROP_0,
PROP_LABEL_FILE,
PROP_SCORE_THRESHOLD,
PROP_SIZE_THRESHOLD
};
#define GST_SSD_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD 0.3f /* 0 to 1 */
#define GST_SSD_OBJECT_DETECTOR_DEFAULT_SIZE_THRESHOLD 0.9f /* 0 to 1 */
static GstStaticPadTemplate gst_ssd_object_detector_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
@ -144,6 +146,21 @@ gst_ssd_object_detector_class_init (GstSsdObjectDetectorClass * klass)
(GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
/**
* GstSsdObjectDetector:size-threshold
*
* Threshold for deciding when to remove boxes based on proportion of the image
*
* Since: 1.26
*/
g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SIZE_THRESHOLD,
g_param_spec_float ("size-threshold",
"Size threshold",
"Threshold for deciding when to remove boxes based on proportion of the image",
0.0, 1.0, GST_SSD_OBJECT_DETECTOR_DEFAULT_SIZE_THRESHOLD,
(GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
gst_element_class_set_static_metadata (element_class, "objectdetector",
"Filter/Effect/Video",
"Apply tensor output from inference to detect objects in video frames",
@ -161,6 +178,8 @@ gst_ssd_object_detector_class_init (GstSsdObjectDetectorClass * klass)
static void
gst_ssd_object_detector_init (GstSsdObjectDetector * self)
{
self->size_threshold = GST_SSD_OBJECT_DETECTOR_DEFAULT_SIZE_THRESHOLD;
self->score_threshold = GST_SSD_OBJECT_DETECTOR_DEFAULT_SCORE_THRESHOLD;
}
static void
@ -251,6 +270,11 @@ gst_ssd_object_detector_set_property (GObject * object, guint prop_id,
self->score_threshold = g_value_get_float (value);
GST_OBJECT_UNLOCK (self);
break;
case PROP_SIZE_THRESHOLD:
GST_OBJECT_LOCK (self);
self->size_threshold = g_value_get_float (value);
GST_OBJECT_UNLOCK (self);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -272,6 +296,11 @@ gst_ssd_object_detector_get_property (GObject * object, guint prop_id,
g_value_set_float (value, self->score_threshold);
GST_OBJECT_UNLOCK (self);
break;
case PROP_SIZE_THRESHOLD:
GST_OBJECT_LOCK (self);
g_value_set_float (value, self->size_threshold);
GST_OBJECT_UNLOCK (self);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -481,6 +510,13 @@ DEFINE_GET_FUNC (guint32, UINT32_MAX)
i * 4 + 3, &bwidth))
continue;
if (CLAMP (bwidth, 0, 1) * CLAMP (bheight, 0, 1) > self->size_threshold) {
GST_LOG_OBJECT (self, "Object at (%fx%f)=%f > %f, skipping",
CLAMP (bwidth, 0, 1), CLAMP (bheight, 0, 1),
CLAMP (bwidth, 0, 1) * CLAMP (bheight, 0, 1), self->size_threshold);
continue;
}
if (self->labels && classes_map.memory &&
get_guint32_at_index (&tmeta->tensor[classes_index], &classes_map,
i, &bclass)) {

1
subprojects/gst-plugins-bad/ext/onnx/decoders/gstssdobjectdetector.h
View file

@ -51,6 +51,7 @@ struct _GstSsdObjectDetector
gchar *label_file;
GArray *labels;
gfloat score_threshold;
gfloat size_threshold;
GstVideoInfo video_info;
};