mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

iqa: Fix all leaks in error path

Browse source 
CID #1456049
CID #1456080
CID #1456083

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1244>
This commit is contained in:
Edward Hervey 2020-05-05 17:40:51 +02:00 committed by GStreamer Merge Bot
parent 4ccd59eb24
commit 75289d83a1
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/iqa/iqa.c
View file

@ -118,7 +118,7 @@ static gboolean
do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp, do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
GstBuffer * outbuf, GstStructure * msg_structure, gchar * padname) GstBuffer * outbuf, GstStructure * msg_structure, gchar * padname)
{ {
dssim_attr *attr = dssim_create_attr (); dssim_attr *attr;
gint y; gint y;
unsigned char **ptrs, **ptrs2; unsigned char **ptrs, **ptrs2;
GstMapInfo ref_info; GstMapInfo ref_info;
@ -132,11 +132,8 @@ do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
gint i; gint i;
dssim_rgba *out; dssim_rgba *out;
GstStructure *dssim_structure; GstStructure *dssim_structure;
gboolean ret = TRUE;
gst_structure_get (msg_structure, "dssim", GST_TYPE_STRUCTURE,
&dssim_structure, NULL);
dssim_set_save_ssim_maps (attr, 1, 1);
if (ref->info.width != cmp->info.width || if (ref->info.width != cmp->info.width ||
ref->info.height != cmp->info.height) { ref->info.height != cmp->info.height) {
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
@ -153,6 +150,12 @@ do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
return FALSE; return FALSE;
} }
gst_structure_get (msg_structure, "dssim", GST_TYPE_STRUCTURE,
&dssim_structure, NULL);
attr = dssim_create_attr ();
dssim_set_save_ssim_maps (attr, 1, 1);
gst_buffer_map (ref->buffer, &ref_info, GST_MAP_READ); gst_buffer_map (ref->buffer, &ref_info, GST_MAP_READ);
gst_buffer_map (cmp->buffer, &cmp_info, GST_MAP_READ); gst_buffer_map (cmp->buffer, &cmp_info, GST_MAP_READ);
gst_buffer_map (outbuf, &out_info, GST_MAP_WRITE); gst_buffer_map (outbuf, &out_info, GST_MAP_WRITE);
@ -197,7 +200,8 @@ do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
return FALSE; ret = FALSE;
goto cleanup_return;
} }
if (dssim > self->max_dssim) { if (dssim > self->max_dssim) {
@ -216,6 +220,11 @@ do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
gst_structure_set (dssim_structure, padname, G_TYPE_DOUBLE, dssim, NULL); gst_structure_set (dssim_structure, padname, G_TYPE_DOUBLE, dssim, NULL);
gst_structure_set (msg_structure, "dssim", GST_TYPE_STRUCTURE, gst_structure_set (msg_structure, "dssim", GST_TYPE_STRUCTURE,
dssim_structure, NULL); dssim_structure, NULL);
ret = TRUE;
cleanup_return:
gst_structure_free (dssim_structure); gst_structure_free (dssim_structure);
free (map_meta.data); free (map_meta.data);
@ -228,7 +237,7 @@ do_dssim (GstIqa * self, GstVideoFrame * ref, GstVideoFrame * cmp,
dssim_dealloc_image (cmp_image); dssim_dealloc_image (cmp_image);
dssim_dealloc_attr (attr); dssim_dealloc_attr (attr);
return TRUE; return ret;
} }
#endif #endif