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

pleorasrc: allow config file to specify only one of stream or device

Browse Source
This commit is contained in:
Joshua M. Doe 2019-10-22 12:26:01 -04:00
parent 76e67ee5fc
commit 4b03de07fe
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/pleora/gstpleorasrc.cpp
View File

@ -622,6 +622,16 @@ gst_pleorasrc_restore_device_from_config (GstPleoraSrc * src)
return FALSE; return FALSE;
} }
if (lConfigReader.GetDeviceCount () == 0) {
GST_DEBUG_OBJECT (src, "Config file has no device configurations");
return TRUE;
} else {
PvString name;
lConfigReader.GetDeviceName (0, name);
GST_DEBUG_OBJECT (src, "Loading device config named '%s'",
name.GetAscii ());
}
if (src->device == NULL) { if (src->device == NULL) {
PvDeviceGEV *lDeviceGEV = new PvDeviceGEV (); PvDeviceGEV *lDeviceGEV = new PvDeviceGEV ();
PvDeviceU3V *lDeviceU3V = new PvDeviceU3V (); PvDeviceU3V *lDeviceU3V = new PvDeviceU3V ();
@ -638,7 +648,7 @@ gst_pleorasrc_restore_device_from_config (GstPleoraSrc * src)
src->device = lDeviceU3V; src->device = lDeviceU3V;
delete lDeviceGEV; delete lDeviceGEV;
} else { } else {
GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS, GST_ELEMENT_WARNING (src, RESOURCE, SETTINGS,
("Failed to restore device from config file (%s): %s", ("Failed to restore device from config file (%s): %s",
src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL)); src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL));
return FALSE; return FALSE;
@ -648,7 +658,7 @@ gst_pleorasrc_restore_device_from_config (GstPleoraSrc * src)
GST_DEBUG_OBJECT (src, "Restoring device settings from config file"); GST_DEBUG_OBJECT (src, "Restoring device settings from config file");
pvRes = lConfigReader.Restore (0, src->device); pvRes = lConfigReader.Restore (0, src->device);
if (!pvRes.IsOK ()) { if (!pvRes.IsOK ()) {
GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS, GST_ELEMENT_WARNING (src, RESOURCE, SETTINGS,
("Failed to restore device from config file (%s): %s", ("Failed to restore device from config file (%s): %s",
src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL)); src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL));
return FALSE; return FALSE;
@ -673,6 +683,16 @@ gst_pleorasrc_restore_stream_from_config (GstPleoraSrc * src)
return FALSE; return FALSE;
} }
if (lConfigReader.GetStreamCount () == 0) {
GST_DEBUG_OBJECT (src, "Config file has no stream configurations");
return TRUE;
} else {
PvString name;
lConfigReader.GetStreamName (0, name);
GST_DEBUG_OBJECT (src, "Loading stream config named '%s'",
name.GetAscii ());
}
if (src->stream == NULL) { if (src->stream == NULL) {
PvStreamGEV *lStreamGEV = new PvStreamGEV (); PvStreamGEV *lStreamGEV = new PvStreamGEV ();
PvStreamU3V *lStreamU3V = new PvStreamU3V (); PvStreamU3V *lStreamU3V = new PvStreamU3V ();
@ -689,7 +709,7 @@ gst_pleorasrc_restore_stream_from_config (GstPleoraSrc * src)
src->stream = lStreamU3V; src->stream = lStreamU3V;
delete lStreamGEV; delete lStreamGEV;
} else { } else {
GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS, GST_ELEMENT_WARNING (src, RESOURCE, SETTINGS,
("Failed to restore stream from config file (%s): %s", ("Failed to restore stream from config file (%s): %s",
src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL)); src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL));
return FALSE; return FALSE;
@ -699,7 +719,7 @@ gst_pleorasrc_restore_stream_from_config (GstPleoraSrc * src)
GST_DEBUG_OBJECT (src, "Restoring stream settings from config file"); GST_DEBUG_OBJECT (src, "Restoring stream settings from config file");
pvRes = lConfigReader.Restore (0, src->stream); pvRes = lConfigReader.Restore (0, src->stream);
if (!pvRes.IsOK ()) { if (!pvRes.IsOK ()) {
GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS, GST_ELEMENT_WARNING (src, RESOURCE, SETTINGS,
("Failed to restore stream from config file (%s): %s", ("Failed to restore stream from config file (%s): %s",
src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL)); src->config_file, pvRes.GetDescription ().GetAscii ()), (NULL));
return FALSE; return FALSE;
@ -718,13 +738,11 @@ gst_pleorasrc_setup_stream (GstPleoraSrc * src)
if (g_strcmp0 (src->config_file, DEFAULT_PROP_CONFIG_FILE) != 0 && if (g_strcmp0 (src->config_file, DEFAULT_PROP_CONFIG_FILE) != 0 &&
src->config_file_connect) { src->config_file_connect) {
if (!gst_pleorasrc_restore_device_from_config (src)) { if (!gst_pleorasrc_restore_device_from_config (src) ||
/* error already sent */ !gst_pleorasrc_restore_stream_from_config (src)) {
return FALSE; GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS,
} ("Failed to load device or stream config from file (%s)",
src->config_file), (NULL));
if (!gst_pleorasrc_restore_stream_from_config (src)) {
/* error already sent */
return FALSE; return FALSE;
} }
} else { } else {