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

niimaq: use pad_alloc_buffer instead of g_malloc

Browse Source
This commit is contained in:
Joshua M. Doe 2012-06-29 02:45:16 -04:00
parent 48ea4b565d
commit 05cd4f3438
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/niimaq/gstniimaq.c
View File

@ -651,14 +651,13 @@ static GstFlowReturn
gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer) gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
{ {
GstNiImaqSrc *niimaqsrc = GST_NIIMAQSRC (psrc); GstNiImaqSrc *niimaqsrc = GST_NIIMAQSRC (psrc);
gpointer data; GstFlowReturn ret = GST_FLOW_OK;
GstFlowReturn res = GST_FLOW_OK;
guint i; guint i;
GstNiImaqSrcFrameTime *frametime; GstNiImaqSrcFrameTime *frametime;
GstClockTime timestamp = GST_CLOCK_TIME_NONE; GstClockTime timestamp = GST_CLOCK_TIME_NONE;
GstClockTime timestamp2 = GST_CLOCK_TIME_NONE; GstClockTime timestamp2 = GST_CLOCK_TIME_NONE;
GstClockTime duration = GST_CLOCK_TIME_NONE; GstClockTime duration = GST_CLOCK_TIME_NONE;
guint8 *data;
uInt32 copied_number; uInt32 copied_number;
uInt32 copied_index; uInt32 copied_index;
Int32 rval; Int32 rval;
@ -693,11 +692,21 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
niimaqsrc->session_started = TRUE; niimaqsrc->session_started = TRUE;
} }
data = g_malloc (niimaqsrc->framesize); ret =
gst_pad_alloc_buffer (GST_BASE_SRC_PAD (niimaqsrc), 0,
niimaqsrc->framesize, GST_PAD_CAPS (GST_BASE_SRC_PAD (niimaqsrc)),
buffer);
if (ret != GST_FLOW_OK) {
GST_ELEMENT_ERROR (niimaqsrc, RESOURCE, FAILED,
("Failed to allocate buffer"),
("Failed to get downstream pad to allocate buffer"));
goto error;
}
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 */ data = GST_BUFFER_DATA (*buffer);
/* TODO: optionally use ExamineBuffer and byteswap in transfer (to offer BIG_ENDIAN) */
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);
@ -715,13 +724,6 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
GST_CLOCK_DIFF (gst_element_get_base_time (GST_ELEMENT (niimaqsrc)), gst_clock_get_time (clock)); GST_CLOCK_DIFF (gst_element_get_base_time (GST_ELEMENT (niimaqsrc)), gst_clock_get_time (clock));
gst_object_unref (clock); */ gst_object_unref (clock); */
GST_DEBUG_OBJECT (niimaqsrc, "Creating buffer");
*buffer = gst_buffer_new ();
GST_BUFFER_DATA (*buffer) = data;
GST_BUFFER_MALLOCDATA (*buffer) = data;
GST_BUFFER_SIZE (*buffer) = niimaqsrc->framesize;
GST_BUFFER_OFFSET (*buffer) = copied_number; GST_BUFFER_OFFSET (*buffer) = copied_number;
GST_BUFFER_OFFSET_END (*buffer) = copied_number; GST_BUFFER_OFFSET_END (*buffer) = copied_number;
@ -818,11 +820,11 @@ gst_niimaqsrc_create (GstPushSrc * psrc, GstBuffer ** buffer)
gst_pad_push_event (GST_BASE_SRC_PAD (niimaqsrc), e); gst_pad_push_event (GST_BASE_SRC_PAD (niimaqsrc), e);
niimaqsrc->start_time_sent = TRUE; niimaqsrc->start_time_sent = TRUE;
} }
return res; return ret;
error: error:
{ {
return GST_FLOW_ERROR; return ret;
} }
} }