framelinksrc: show error code on failure and fix some formatting

This commit is contained in:
Joshua M. Doe 2014-01-15 08:58:14 -05:00
parent 60af9bc88f
commit 87b92a8f79

View File

@ -318,13 +318,16 @@ gst_framelinksrc_start (GstBaseSrc * bsrc)
/* TODO: use VCECLB_InitByHandle */ /* TODO: use VCECLB_InitByHandle */
src->grabber = VCECLB_Init (); src->grabber = VCECLB_Init ();
if (src->grabber == NULL) { if (src->grabber == NULL) {
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, ("Failed to initialize grabber"), (NULL)); /* TODO: get error string */ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
("Failed to initialize grabber (code %d)", VCECLB_CardLastError ()),
(NULL));
return FALSE; return FALSE;
} }
err = VCECLB_GetDMAAccessEx (src->grabber, src->channel); err = VCECLB_GetDMAAccessEx (src->grabber, src->channel);
if (err != VCECLB_Err_Success) { if (err != VCECLB_Err_Success) {
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, ("Failed to get DMA access to port on grabber"), (NULL)); /* TODO: get error string */ GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
("Failed to get DMA access to port on grabber (code %d)", err), (NULL));
return FALSE; return FALSE;
} }
@ -332,7 +335,8 @@ gst_framelinksrc_start (GstBaseSrc * bsrc)
VCECLB_PrepareEx (src->grabber, src->channel, VCECLB_PrepareEx (src->grabber, src->channel,
&camConfig.pixelInfo.cameraData); &camConfig.pixelInfo.cameraData);
if (err != VCECLB_Err_Success) { if (err != VCECLB_Err_Success) {
GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS, ("Failed to configure grabber"), (NULL)); /* TODO: get error string */ GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS,
("Failed to configure grabber (code %d)", err), (NULL));
return FALSE; return FALSE;
} }
@ -392,13 +396,13 @@ gst_framelinksrc_stop (GstBaseSrc * bsrc)
if (src->acq_started) { if (src->acq_started) {
VCECLB_StopGrabEx (src->grabber, src->channel); VCECLB_StopGrabEx (src->grabber, src->channel);
src->acq_started = FALSE; src->acq_started = FALSE;
} }
if (src->grabber) { if (src->grabber) {
VCECLB_ReleaseDMAAccessEx (src->grabber, src->channel); VCECLB_ReleaseDMAAccessEx (src->grabber, src->channel);
VCECLB_Done (src->grabber); VCECLB_Done (src->grabber);
src->grabber = NULL; src->grabber = NULL;
} }
src->dropped_frame_count = 0; src->dropped_frame_count = 0;