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

saperasrc: use GST_ELEMENT_ERROR instead of just GST_ERROR_OBJECT

Browse Source
This commit is contained in:
Joshua M. Doe 2016-07-26 09:01:40 -04:00
parent 27b721ad21
commit bfd9a2fcd7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/sapera/gstsaperasrc.cpp
View File

@ -596,19 +596,21 @@ gst_saperasrc_start (GstBaseSrc * bsrc)
GST_DEBUG_OBJECT (src, "start"); GST_DEBUG_OBJECT (src, "start");
if (!strlen (src->format_file)) { if (!strlen (src->format_file)) {
GST_ERROR_OBJECT (src, "Format file must be specified"); GST_ELEMENT_ERROR (src, RESOURCE, FAILED,
("Configuration file has not been specified"), (NULL));
return FALSE; return FALSE;
} }
if (!g_file_test (src->format_file, G_FILE_TEST_EXISTS)) { if (!g_file_test (src->format_file, G_FILE_TEST_EXISTS)) {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
("Format file does not exist: %s", src->format_file), (NULL)); ("Configuration file does not exist: %s", src->format_file), (NULL));
return FALSE; return FALSE;
} }
GST_DEBUG_OBJECT (src, "About to initialize and create Sapera objects"); GST_DEBUG_OBJECT (src, "About to initialize and create Sapera objects");
if (!gst_saperasrc_init_objects (src) || !gst_saperasrc_create_objects (src)) { if (!gst_saperasrc_init_objects (src) || !gst_saperasrc_create_objects (src)) {
GST_ERROR_OBJECT (src, "Failed to create Sapera objects"); GST_ELEMENT_ERROR (src, RESOURCE, FAILED,
("Failed to create Sapera objects"), (NULL));
return FALSE; return FALSE;
} }
@ -637,8 +639,9 @@ gst_saperasrc_start (GstBaseSrc * bsrc)
if (gst_format == GST_VIDEO_FORMAT_UNKNOWN) { if (gst_format == GST_VIDEO_FORMAT_UNKNOWN) {
char format_name[17]; char format_name[17];
SapManager::GetStringFromFormat (sap_format, format_name); SapManager::GetStringFromFormat (sap_format, format_name);
GST_ERROR_OBJECT (src, "Unsupported format: %s", format_name); GST_ELEMENT_ERROR (src, RESOURCE, FAILED,
("Unsupported format: %s", format_name), (NULL));
return FALSE;
} }
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
@ -652,7 +655,7 @@ gst_saperasrc_start (GstBaseSrc * bsrc)
src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0); src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0);
if (!src->sap_xfer->Grab ()) { if (!src->sap_xfer->Grab ()) {
GST_ERROR_OBJECT (src, "Failed to start grab"); GST_ELEMENT_ERROR (src, RESOURCE, FAILED, ("Failed to start grab"), (NULL));
return FALSE; return FALSE;
} }