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

pylonsrc: fixed typo in propAutoFeature

Browse Source
This commit is contained in:
mrstecklo 2021-02-02 09:48:47 +03:00 committed by joshdoe
parent 2ea7e9ee63
commit 82502f44ce
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/pylon/gstpylonsrc.c
View File

@ -193,7 +193,7 @@ G_STATIC_ASSERT (AUTOF_NUM_LIMITED == GST_PYLONSRC_NUM_LIMITED_FEATURES);
static const char *const featAutoFeature[AUTOF_NUM_FEATURES] = static const char *const featAutoFeature[AUTOF_NUM_FEATURES] =
{ "GainAuto", "ExposureAuto", "BalanceWhiteAuto" }; { "GainAuto", "ExposureAuto", "BalanceWhiteAuto" };
static const GST_PYLONSRC_PROP propAutoFeature[AUTOF_NUM_FEATURES] = static const GST_PYLONSRC_PROP propAutoFeature[AUTOF_NUM_FEATURES] =
{ PROP_GAIN, PROP_EXPOSURE, PROP_AUTOWHITEBALANCE }; { PROP_AUTOGAIN, PROP_AUTOEXPOSURE, PROP_AUTOWHITEBALANCE };
// Yes,there is no "WhiteBalance" feature, it is only used for logging // Yes,there is no "WhiteBalance" feature, it is only used for logging
static const char *const featManualFeature[AUTOF_NUM_FEATURES] = static const char *const featManualFeature[AUTOF_NUM_FEATURES] =
{ "Gain", "ExposureTime", "WhiteBalance" }; { "Gain", "ExposureTime", "WhiteBalance" };
@ -779,6 +779,21 @@ set_prop_implicitly (GObject * object, GST_PYLONSRC_PROP prop,
} }
} }
// Use in gst_pylonsrc_set_property to set related string property
static inline void
set_string_prop_implicitly(GObject* object, GST_PYLONSRC_PROP prop,
GParamSpec* pspec, const gchar * str_val)
{
GstPylonSrc* src = GST_PYLONSRC(object);
if (!is_prop_set(src, prop)) {
GValue val = G_VALUE_INIT;
g_value_init(&val, G_TYPE_STRING);
g_value_set_string(&val, str_val);
gst_pylonsrc_set_property(object, prop, &val, pspec);
g_value_unset(&val);
}
}
/* plugin's parameters/properties */ /* plugin's parameters/properties */
void void
gst_pylonsrc_set_property (GObject * object, guint property_id, gst_pylonsrc_set_property (GObject * object, guint property_id,
@ -934,9 +949,13 @@ gst_pylonsrc_set_property (GObject * object, guint property_id,
break; break;
case PROP_EXPOSURE: case PROP_EXPOSURE:
src->limitedFeature[AUTOF_EXPOSURE].manual = g_value_get_double (value); src->limitedFeature[AUTOF_EXPOSURE].manual = g_value_get_double (value);
// disable autoexposure unless set explicitly
set_string_prop_implicitly(object, PROP_AUTOEXPOSURE, pspec, "off");
break; break;
case PROP_GAIN: case PROP_GAIN:
src->limitedFeature[AUTOF_GAIN].manual = g_value_get_double (value); src->limitedFeature[AUTOF_GAIN].manual = g_value_get_double (value);
// disable autoexposure unless set explicitly
set_string_prop_implicitly(object, PROP_AUTOGAIN, pspec, "off");
break; break;
case PROP_BLACKLEVEL: case PROP_BLACKLEVEL:
src->blacklevel = g_value_get_double (value); src->blacklevel = g_value_get_double (value);