yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leaks

Browse Source
This commit is contained in:
Joshua M. Doe 2012-05-10 15:24:14 -04:00
parent db54d20753
commit 13dbcbb0e2
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sys/niimaq/gstniimaq.c
View File

@ -118,6 +118,7 @@ static gboolean gst_niimaqsrc_set_caps_framesize (GstStructure * gs, gint width,
gint height); gint height);
static GstCaps *gst_niimaqsrc_get_cam_caps (GstNiImaqSrc * src); static GstCaps *gst_niimaqsrc_get_cam_caps (GstNiImaqSrc * src);
static void gst_niimaqsrc_close_interface (GstNiImaqSrc * niimaqsrc);
uInt32 uInt32
gst_niimaqsrc_report_imaq_error (uInt32 code) { gst_niimaqsrc_report_imaq_error (uInt32 code) {
@ -528,12 +529,20 @@ gst_niimaqsrc_dispose (GObject * object)
{ {
GstNiImaqSrc *niimaqsrc = GST_NIIMAQSRC (object); GstNiImaqSrc *niimaqsrc = GST_NIIMAQSRC (object);
gst_niimaqsrc_close_interface (niimaqsrc);
/* free memory allocated */ /* free memory allocated */
g_free (niimaqsrc->camera_name); g_free (niimaqsrc->camera_name);
niimaqsrc->camera_name = NULL; niimaqsrc->camera_name = NULL;
g_free (niimaqsrc->interface_name); g_free (niimaqsrc->interface_name);
niimaqsrc->interface_name = NULL; niimaqsrc->interface_name = NULL;
if (niimaqsrc->caps)
gst_caps_unref (niimaqsrc->caps);
g_slist_free (niimaqsrc->timelist);
g_mutex_free (niimaqsrc->frametime_mutex);
/* chain dispose fuction of parent class */ /* chain dispose fuction of parent class */
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
} }
@ -699,17 +708,7 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
("Camera doesn't seem to want to turn on!"), ("Camera doesn't seem to want to turn on!"),
("Camera doesn't seem to want to turn on!")); ("Camera doesn't seem to want to turn on!"));
if (niimaqsrc->sid) { gst_niimaqsrc_close_interface (niimaqsrc);
rval = imgClose (niimaqsrc->sid,TRUE);
gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->sid = 0;
}
if (niimaqsrc->iid) {
rval = imgClose (niimaqsrc->iid,TRUE);
gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->iid = 0;
}
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
@ -1091,17 +1090,7 @@ gst_niimaqsrc_start (GstBaseSrc * src)
return TRUE; return TRUE;
error: error:
/* close IMAQ session and interface */ gst_niimaqsrc_close_interface (niimaqsrc);
if(niimaqsrc->sid) {
rval = imgClose(niimaqsrc->sid,TRUE);
gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->sid = 0;
}
if(niimaqsrc->iid) {
rval = imgClose(niimaqsrc->iid,TRUE);
gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->iid = 0;
}
return FALSE;; return FALSE;;
@ -1122,6 +1111,7 @@ gst_niimaqsrc_stop (GstBaseSrc * src)
Int32 rval; Int32 rval;
/* stop IMAQ session */ /* stop IMAQ session */
if (niimaqsrc->session_started) {
rval = imgSessionStopAcquisition (niimaqsrc->sid); rval = imgSessionStopAcquisition (niimaqsrc->sid);
if (rval) { if (rval) {
gst_niimaqsrc_report_imaq_error (rval); gst_niimaqsrc_report_imaq_error (rval);
@ -1129,27 +1119,42 @@ gst_niimaqsrc_stop (GstBaseSrc * src)
("Unable to stop acquisition")); ("Unable to stop acquisition"));
} }
niimaqsrc->session_started = FALSE; niimaqsrc->session_started = FALSE;
GST_DEBUG_OBJECT (niimaqsrc, "Acquisition stopped"); GST_DEBUG_OBJECT (niimaqsrc, "Acquisition stopped");
}
gst_niimaqsrc_close_interface(niimaqsrc);
if (niimaqsrc->caps) {
gst_caps_unref (niimaqsrc->caps);
niimaqsrc->caps = NULL;
}
}
/**
* gst_niimaqsrc_close_interface:
* niimaqsrc: #GstNiImaqSrc instance
*
* Close IMAQ session and interface
*
*/
static void
gst_niimaqsrc_close_interface (GstNiImaqSrc * niimaqsrc)
{
Int32 rval;
/* close IMAQ session and interface */ /* close IMAQ session and interface */
if(niimaqsrc->sid) { if(niimaqsrc->sid) {
rval = imgClose(niimaqsrc->sid,TRUE); rval = imgClose(niimaqsrc->sid,TRUE);
gst_niimaqsrc_report_imaq_error (rval); gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->sid = 0; niimaqsrc->sid = 0;
GST_DEBUG_OBJECT (niimaqsrc, "IMAQ session closed");
} }
if(niimaqsrc->iid) { if(niimaqsrc->iid) {
rval = imgClose(niimaqsrc->iid,TRUE); rval = imgClose(niimaqsrc->iid,TRUE);
gst_niimaqsrc_report_imaq_error (rval); gst_niimaqsrc_report_imaq_error (rval);
niimaqsrc->iid = 0; niimaqsrc->iid = 0;
}
GST_DEBUG_OBJECT (niimaqsrc, "IMAQ interface closed"); GST_DEBUG_OBJECT (niimaqsrc, "IMAQ interface closed");
}
gst_caps_unref (niimaqsrc->caps);
niimaqsrc->caps = NULL;
return TRUE;
} }
/** /**