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

pixcisrc: only use format-file if specified, ignoring format-name

Browse Source
This commit is contained in:
Joshua M. Doe 2018-10-02 07:36:53 -04:00
parent 9142674df2
commit cde7de8b97
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/pixci/gstpixcisrc.c
View File

@ -504,26 +504,30 @@ gst_pixcisrc_start (GstBaseSrc * bsrc)
{ {
GstPixciSrc *src = GST_PIXCI_SRC (bsrc); GstPixciSrc *src = GST_PIXCI_SRC (bsrc);
int pxerr; int pxerr;
GEnumClass *video_format_enum_class;
GEnumValue *video_format_enum_value;
GST_DEBUG_OBJECT (src, "start"); GST_DEBUG_OBJECT (src, "start");
if (strlen (src->format_file) /* open with either a format name or config file */
&& !g_file_test (src->format_file, G_FILE_TEST_EXISTS)) { if (strlen (src->format_file)) {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, if (!g_file_test (src->format_file, G_FILE_TEST_EXISTS)) {
("Format file does not exist: %s", src->format_file), (NULL)); GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
return FALSE; ("Format file does not exist: %s", src->format_file), (NULL));
return FALSE;
}
pxerr = pxd_PIXCIopen (src->driver_params, NULL, src->format_file);
} else {
GEnumClass *video_format_enum_class;
GEnumValue *video_format_enum_value;
video_format_enum_class = g_type_class_ref (GST_TYPE_PIXCI_VIDEO_FORMAT);
video_format_enum_value =
g_enum_get_value (video_format_enum_class, src->format_name);
pxerr =
pxd_PIXCIopen (src->driver_params, video_format_enum_value->value_name,
NULL);
g_type_class_unref (video_format_enum_class);
} }
/* open XCLIB library and driver */
video_format_enum_class = g_type_class_ref (GST_TYPE_PIXCI_VIDEO_FORMAT);
video_format_enum_value =
g_enum_get_value (video_format_enum_class, src->format_name);
pxerr =
pxd_PIXCIopen (src->driver_params, video_format_enum_value->value_name,
src->format_file);
g_type_class_unref (video_format_enum_class);
if (pxerr) { if (pxerr) {
char buf[1024]; char buf[1024];
pxd_mesgFaultText (src->unitmap, buf, 1024); pxd_mesgFaultText (src->unitmap, buf, 1024);