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

niimaq: fix some bugs regarding valid clocks, etc.

Browse Source
This commit is contained in:
Joshua M. Doe 2012-06-14 13:29:59 -04:00
parent e5a4257891
commit 18f3e03c7e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/niimaq/gstniimaq.c
View File

@ -145,8 +145,12 @@ gst_niimaqsrc_frame_start_callback (SESSION_ID sid, IMG_ERR err,
/* get clock time and set to frametime struct */ /* get clock time and set to frametime struct */
clock = gst_element_get_clock (GST_ELEMENT (niimaqsrc)); clock = gst_element_get_clock (GST_ELEMENT (niimaqsrc));
frametime->time = gst_clock_get_time (clock); if (G_LIKELY (clock)) {
gst_object_unref (clock); frametime->time = gst_clock_get_time (clock);
gst_object_unref (clock);
} else {
frametime->time = GST_CLOCK_TIME_NONE;
}
/* get current frame number */ /* get current frame number */
imgGetAttribute (sid, IMG_ATTR_FRAME_COUNT, &val); imgGetAttribute (sid, IMG_ATTR_FRAME_COUNT, &val);
@ -536,12 +540,16 @@ gst_niimaqsrc_dispose (GObject * object)
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_slist_free (niimaqsrc->timelist);
niimaqsrc->timelist = NULL;
g_mutex_free (niimaqsrc->frametime_mutex); g_mutex_free (niimaqsrc->frametime_mutex);
niimaqsrc->frametime_mutex = NULL;
/* unref objects */
if (niimaqsrc->caps) {
gst_caps_unref (niimaqsrc->caps);
niimaqsrc->caps = NULL;
}
/* 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);
@ -721,6 +729,7 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
GST_DEBUG_OBJECT (niimaqsrc, "Copying IMAQ buffer %d", niimaqsrc->cumbufnum); GST_DEBUG_OBJECT (niimaqsrc, "Copying IMAQ buffer %d", niimaqsrc->cumbufnum);
/* TODO: use ExamineBuffer instead and byteswap in transfer */
rval = rval =
imgSessionCopyBufferByNumber (niimaqsrc->sid, niimaqsrc->cumbufnum, data, imgSessionCopyBufferByNumber (niimaqsrc->sid, niimaqsrc->cumbufnum, data,
IMG_OVERWRITE_GET_OLDEST, &copied_number, &copied_index); IMG_OVERWRITE_GET_OLDEST, &copied_number, &copied_index);
@ -728,7 +737,7 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
gst_niimaqsrc_report_imaq_error (rval); gst_niimaqsrc_report_imaq_error (rval);
GST_ELEMENT_ERROR (niimaqsrc, RESOURCE, FAILED, GST_ELEMENT_ERROR (niimaqsrc, RESOURCE, FAILED,
("failed to copy buffer %d", niimaqsrc->cumbufnum), ("failed to copy buffer %d", niimaqsrc->cumbufnum),
("failed to copy buffer %d, IMAQ error: \"%s\"", niimaqsrc->cumbufnum)); ("failed to copy buffer %d", niimaqsrc->cumbufnum));
goto error; goto error;
} }
@ -1093,6 +1102,8 @@ gst_niimaqsrc_stop (GstBaseSrc * src)
gst_caps_unref (niimaqsrc->caps); gst_caps_unref (niimaqsrc->caps);
niimaqsrc->caps = NULL; niimaqsrc->caps = NULL;
} }
return TRUE;
} }
/** /**