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

niimaqdxsrc: send error msg on unsupported pixel formats, not assert

Browse Source
This commit is contained in:
Joshua M. Doe 2015-09-15 15:33:09 -04:00
parent 7b8a6f2453
commit 4ea4487d2f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/niimaqdx/gstniimaqdx.c
View File

@ -581,6 +581,8 @@ gst_niimaqdxsrc_reset (GstNiImaqDxSrc * niimaqdxsrc)
niimaqdxsrc->width = 0;
niimaqdxsrc->height = 0;
niimaqdxsrc->dx_row_stride = 0;
niimaqdxsrc->caps_info = NULL;
niimaqdxsrc->pixel_format[0] = 0;
niimaqdxsrc->start_time = NULL;
niimaqdxsrc->start_time_sent = FALSE;
niimaqdxsrc->base_time = GST_CLOCK_TIME_NONE;
@ -662,11 +664,16 @@ gst_niimaqdxsrc_fill (GstPushSrc * src, GstBuffer * buf)
}
}
if (niimaqdxsrc->caps_info == NULL) {
GST_ELEMENT_ERROR (niimaqdxsrc, RESOURCE, FAILED,
("Failed to create caps, possibly unsupported format (%s).",
niimaqdxsrc->pixel_format), (NULL));
return GST_FLOW_ERROR;
}
GST_LOG_OBJECT (niimaqdxsrc, "Copying IMAQ buffer #%d, buffersize %d",
niimaqdxsrc->cumbufnum, gst_buffer_get_size (buf));
g_assert (niimaqdxsrc->caps_info != NULL);
do_align_stride =
(niimaqdxsrc->dx_row_stride % niimaqdxsrc->caps_info->row_multiple) != 0;

1
sys/niimaqdx/gstniimaqdx.h
View File

@ -66,6 +66,7 @@ struct _GstNiImaqDxSrc {
gboolean bayer_as_gray;
/* image info */
char pixel_format[IMAQDX_MAX_API_STRING_LENGTH];
int width;
int height;
int dx_row_stride;