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

pylonsrc: added custom grab-timeout parameter instead of hardcoded 1s wait.

Browse Source 
Useful when trying to understand bandwith related issues on the Basler cameras.
This commit is contained in:
Eskild Helmersen 2020-05-14 17:44:45 +02:00 committed by joshdoe
parent 88bc6062b3
commit 314581b002
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/pylon/gstpylonsrc.c
View File

@ -171,6 +171,7 @@ typedef enum _GST_PYLONSRC_PROP
PROP_TRANSFORMATION21, PROP_TRANSFORMATION21,
PROP_TRANSFORMATION22, PROP_TRANSFORMATION22,
PROP_FRAMEDROPLIMIT, PROP_FRAMEDROPLIMIT,
PROP_GRABTIMEOUT,
PROP_CONFIGFILE, PROP_CONFIGFILE,
PROP_IGNOREDEFAULTS, PROP_IGNOREDEFAULTS,
@ -351,6 +352,7 @@ ascii_strdown (gchar * *str, gssize len)
#define DEFAULT_PROP_IGNOREDEFAULTS FALSE #define DEFAULT_PROP_IGNOREDEFAULTS FALSE
#define DEFAULT_PROP_COLORADJUSTMENTENABLE TRUE #define DEFAULT_PROP_COLORADJUSTMENTENABLE TRUE
#define DEFAULT_PROP_FRAMEDROPLIMIT 10 #define DEFAULT_PROP_FRAMEDROPLIMIT 10
#define DEFAULT_PROP_GRABTIMEOUT 1000
/* pad templates */ /* pad templates */
static GstStaticPadTemplate gst_pylonsrc_src_template = static GstStaticPadTemplate gst_pylonsrc_src_template =
@ -731,6 +733,11 @@ gst_pylonsrc_class_init (GstPylonSrcClass * klass)
"Specifies the number of consecutive frames to fail before failing everything", "Specifies the number of consecutive frames to fail before failing everything",
0, 100, DEFAULT_PROP_FRAMEDROPLIMIT, 0, 100, DEFAULT_PROP_FRAMEDROPLIMIT,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (gobject_class, PROP_GRABTIMEOUT,
g_param_spec_int ("grab-timeout", "Initial load timeout",
"Specifies the number of miiliseconds to wait for frame to be grabed from the camera.",
0, 60000, DEFAULT_PROP_GRABTIMEOUT,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
} }
static gboolean static gboolean
@ -820,6 +827,7 @@ gst_pylonsrc_init (GstPylonSrc * src)
src->ignoreDefaults = DEFAULT_PROP_IGNOREDEFAULTS; src->ignoreDefaults = DEFAULT_PROP_IGNOREDEFAULTS;
src->frameDropLimit = DEFAULT_PROP_FRAMEDROPLIMIT; src->frameDropLimit = DEFAULT_PROP_FRAMEDROPLIMIT;
src->grabtimeout = DEFAULT_PROP_GRABTIMEOUT;
for (int i = 0; i < PROP_NUM_PROPERTIES; i++) { for (int i = 0; i < PROP_NUM_PROPERTIES; i++) {
src->propFlags[i] = GST_PYLONSRC_PROPST_DEFAULT; src->propFlags[i] = GST_PYLONSRC_PROPST_DEFAULT;
@ -1141,6 +1149,9 @@ gst_pylonsrc_set_property (GObject * object, guint property_id,
case PROP_FRAMEDROPLIMIT: case PROP_FRAMEDROPLIMIT:
src->frameDropLimit = g_value_get_int (value); src->frameDropLimit = g_value_get_int (value);
break; break;
case PROP_GRABTIMEOUT:
src->grabtimeout = g_value_get_int (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
return; return;
@ -1355,6 +1366,9 @@ gst_pylonsrc_get_property (GObject * object, guint property_id,
case PROP_FRAMEDROPLIMIT: case PROP_FRAMEDROPLIMIT:
g_value_set_int (value, src->frameDropLimit); g_value_set_int (value, src->frameDropLimit);
break; break;
case PROP_GRABTIMEOUT:
g_value_set_int (value, src->grabtimeout);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -3800,8 +3814,8 @@ gst_pylonsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
goto error; goto error;
src->acquisition_configured = TRUE; src->acquisition_configured = TRUE;
} }
// Wait for the buffer to be filled (up to 1 s) // Wait for the buffer to be filled (up to n ms). Can fail on large frames if timeout set too low.
res = PylonWaitObjectWait (src->waitObject, 1000, &bufferReady); res = PylonWaitObjectWait (src->waitObject, src->grabtimeout, &bufferReady);
PYLONC_CHECK_ERROR (src, res); PYLONC_CHECK_ERROR (src, res);
if (!bufferReady) { if (!bufferReady) {
GST_ERROR_OBJECT (src, GST_ERROR_OBJECT (src,
@ -3850,8 +3864,9 @@ gst_pylonsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
src->failedFrames += 1; src->failedFrames += 1;
GST_WARNING_OBJECT (src, "Failed capture count=%d. Status=%d", GST_WARNING_OBJECT (src, "Failed capture count=%d. Status=%d",
src->failedFrames, grabResult.Status); src->failedFrames, grabResult.Status);
} else } else {
src->failedFrames = 0; src->failedFrames = 0;
}
} else { } else {
GST_ERROR_OBJECT (src, "Error in the image processing loop. Status=%d", GST_ERROR_OBJECT (src, "Error in the image processing loop. Status=%d",
grabResult.Status); grabResult.Status);

4
sys/pylon/gstpylonsrc.h
View File

@ -39,7 +39,7 @@ enum
GST_PYLONSRC_NUM_CAPTURE_BUFFERS = 10, GST_PYLONSRC_NUM_CAPTURE_BUFFERS = 10,
GST_PYLONSRC_NUM_AUTO_FEATURES = 3, GST_PYLONSRC_NUM_AUTO_FEATURES = 3,
GST_PYLONSRC_NUM_LIMITED_FEATURES = 2, GST_PYLONSRC_NUM_LIMITED_FEATURES = 2,
GST_PYLONSRC_NUM_PROPS = 68 GST_PYLONSRC_NUM_PROPS = 69
}; };
typedef enum _GST_PYLONSRC_PROPERTY_STATE typedef enum _GST_PYLONSRC_PROPERTY_STATE
@ -100,7 +100,7 @@ struct _GstPylonSrc
GstPylonSrcLimitedFeature limitedFeature[GST_PYLONSRC_NUM_LIMITED_FEATURES]; GstPylonSrcLimitedFeature limitedFeature[GST_PYLONSRC_NUM_LIMITED_FEATURES];
gint maxBandwidth, testImage, frameDropLimit; gint maxBandwidth, testImage, frameDropLimit, grabtimeout;
gint size[2]; gint size[2];
gint binning[2]; gint binning[2];
gint maxSize[2]; gint maxSize[2];