mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
Take offset gaps into account.
Prevents measurecollector from crashing when frame numbers are not consecutive. Fixes bug #596285.
This commit is contained in:
parent
1adfafbe2c
commit
05e059c624
1 changed files with 28 additions and 15 deletions
|
@ -135,17 +135,27 @@ gst_measure_collector_post_message (GstMeasureCollector * mc)
|
|||
|
||||
if (strcmp (mc->metric, "SSIM") == 0) {
|
||||
gfloat dresult = 0;
|
||||
guint64 mlen;
|
||||
g_free (mc->result);
|
||||
mc->result = g_new0 (GValue, 1);
|
||||
g_value_init (mc->result, G_TYPE_FLOAT);
|
||||
mlen = mc->measurements->len;
|
||||
for (i = 0; i < mc->measurements->len; i++) {
|
||||
const GValue *v;
|
||||
GstStructure *str =
|
||||
(GstStructure *) g_ptr_array_index (mc->measurements, i);
|
||||
if (str)
|
||||
{
|
||||
v = gst_structure_get_value (str, "mean");
|
||||
dresult += g_value_get_float (v);
|
||||
}
|
||||
g_value_set_float (mc->result, dresult / mc->measurements->len);
|
||||
else
|
||||
{
|
||||
GST_WARNING_OBJECT (mc, "No measurement info for frame %" G_GUINT64_FORMAT, i);
|
||||
mlen--;
|
||||
}
|
||||
}
|
||||
g_value_set_float (mc->result, dresult / mlen);
|
||||
}
|
||||
|
||||
m = gst_message_new_element (GST_OBJECT_CAST (mc),
|
||||
|
@ -269,6 +279,7 @@ gst_measure_collector_save_csv (GstMeasureCollector * mc)
|
|||
for (i = 0; i < mc->measurements->len; i++) {
|
||||
fprintf (file, "\n");
|
||||
str = (GstStructure *) g_ptr_array_index (mc->measurements, i);
|
||||
if (str != NULL) {
|
||||
for (j = 0; j < gst_structure_n_fields (str); j++) {
|
||||
const gchar *fieldname;
|
||||
fieldname = gst_structure_nth_field_name (str, j);
|
||||
|
@ -281,6 +292,7 @@ gst_measure_collector_save_csv (GstMeasureCollector * mc)
|
|||
fprintf (file, "<untranslatable>");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fclose (file);
|
||||
|
||||
|
@ -387,6 +399,7 @@ gst_measure_collector_finalize (GObject * object)
|
|||
GstMeasureCollector *mc = GST_MEASURE_COLLECTOR (object);
|
||||
|
||||
for (i = 0; i < mc->measurements->len; i++) {
|
||||
if (g_ptr_array_index (mc->measurements,i) != NULL)
|
||||
gst_structure_free ((GstStructure *) g_ptr_array_index (mc->measurements,
|
||||
i));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue