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

niimaqsrc: don't send DATE_TIME tag, arfenc will calculate from base time

Browse Source
This commit is contained in:
Joshua M. Doe 2016-07-13 10:58:03 -04:00
parent f96c1087e4
commit 27b721ad21
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/niimaq/gstniimaq.c
View File

@ -131,7 +131,6 @@ struct _GstNiImaqSrcTimeEntry
{ {
guint64 frame_index; guint64 frame_index;
GstClockTime clock_time; GstClockTime clock_time;
GstDateTime *datetime;
}; };
/* This will be called "at the start of acquisition into each image buffer." /* This will be called "at the start of acquisition into each image buffer."
@ -153,13 +152,6 @@ gst_niimaqsrc_frame_start_callback (SESSION_ID sid, IMG_ERR err,
gst_clock_get_time (gst_element_get_clock (GST_ELEMENT (src))); gst_clock_get_time (gst_element_get_clock (GST_ELEMENT (src)));
time_entry->frame_index = index; time_entry->frame_index = index;
if (index == 0) {
/* we only need datetime for first frame, so only call once */
time_entry->datetime = gst_date_time_new_now_utc ();
} else {
time_entry->datetime = NULL;
}
g_async_queue_push (src->time_queue, time_entry); g_async_queue_push (src->time_queue, time_entry);
index++; index++;
@ -352,6 +344,8 @@ gst_niimaqsrc_dispose (GObject * object)
g_free (src->interface_name); g_free (src->interface_name);
src->interface_name = NULL; src->interface_name = NULL;
g_async_queue_unref (src->time_queue);
/* chain dispose fuction of parent class */ /* chain dispose fuction of parent class */
G_OBJECT_CLASS (gst_niimaqsrc_parent_class)->dispose (object); G_OBJECT_CLASS (gst_niimaqsrc_parent_class)->dispose (object);
} }
@ -460,6 +454,11 @@ gst_niimaqsrc_reset (GstNiImaqSrc * src)
g_free (src->buflist); g_free (src->buflist);
src->buflist = NULL; src->buflist = NULL;
if (src->time_queue) {
g_async_queue_unref (src->time_queue);
}
src->time_queue = g_async_queue_new ();
} }
static gboolean static gboolean
@ -501,7 +500,6 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
Int32 rval; Int32 rval;
uInt32 dropped; uInt32 dropped;
GstMapInfo minfo; GstMapInfo minfo;
GstDateTime *start_time = NULL;
GST_LOG_OBJECT (src, "create"); GST_LOG_OBJECT (src, "create");
@ -549,10 +547,6 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
break; break;
} }
if (entry->frame_index == 0) {
start_time = entry->datetime;
}
if (entry->frame_index < copied_number) { if (entry->frame_index < copied_number) {
GST_DEBUG_OBJECT (src, GST_DEBUG_OBJECT (src,
"Got clocktime for frame %d while handling frame %d, frames dropped?", "Got clocktime for frame %d while handling frame %d, frames dropped?",
@ -604,12 +598,6 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
/* set cumulative buffer number to get next frame */ /* set cumulative buffer number to get next frame */
src->cumbufnum = copied_number + 1; src->cumbufnum = copied_number + 1;
if (G_UNLIKELY (start_time)) {
GstTagList *tl = gst_tag_list_new (GST_TAG_DATE_TIME, start_time, NULL);
GstEvent *e = gst_event_new_tag (tl);
GST_DEBUG_OBJECT (src, "Sending start time event: %" GST_PTR_FORMAT, e);
gst_pad_push_event (GST_BASE_SRC_PAD (src), e);
}
return ret; return ret;
error: error: