Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gst: gamma control added for aravissrc (help needed) #940

Closed
wants to merge 2 commits into from
Closed

gst: gamma control added for aravissrc (help needed) #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
534c14d
gst: gamma control added
WhaSukGO Sep 5, 2024
b44d3c7
Merge branch 'main' into gst/analog_control
EmmanuelP Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions gst/gstaravis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ enum
PROP_GAIN_AUTO,
PROP_EXPOSURE,
PROP_EXPOSURE_AUTO,
PROP_GAMMA,
PROP_H_BINNING,
PROP_V_BINNING,
PROP_OFFSET_X,
Expand Down Expand Up @@ -687,6 +688,7 @@ gst_aravis_init (GstAravis *gst_aravis)
gst_aravis->exposure_time_us = -1;
gst_aravis->exposure_auto = ARV_AUTO_OFF;
gst_aravis->exposure_auto_set = FALSE;
gst_aravis->gamma = 1;
gst_aravis->offset_x = 0;
gst_aravis->offset_y = 0;
gst_aravis->h_binning = -1;
Expand Down Expand Up @@ -798,6 +800,25 @@ gst_aravis_set_property (GObject * object, guint prop_id,
arv_camera_set_exposure_time_auto (gst_aravis->camera, gst_aravis->exposure_auto, NULL);
GST_OBJECT_UNLOCK (gst_aravis);
break;
case PROP_GAMMA:
GST_OBJECT_LOCK (gst_aravis);
gst_aravis->gamma = g_value_get_double (value);
if (gst_aravis->camera != NULL &&
arv_camera_is_feature_available (gst_aravis->camera, "Gamma", NULL)) {
// Not working
// arv_device_set_float_feature_value(gst_aravis->camera, "Gamma", gst_aravis->gamma, NULL);

double gamma_max, gamma_min;
arv_camera_get_float_bounds(gst_aravis->camera, "Gamma", &gamma_min, &gamma_max, NULL);

if (gamma_min <= gst_aravis->gamma && gst_aravis->gamma <= gamma_max) {
ArvDevice *device = arv_camera_get_device(gst_aravis->camera);
ArvGcNode *gamma_node = arv_device_get_feature(device, "Gamma");
arv_gc_float_set_value(ARV_GC_FLOAT(gamma_node), gst_aravis->gamma, NULL);
}
}
GST_OBJECT_UNLOCK (gst_aravis);
break;
case PROP_OFFSET_X:
gst_aravis->offset_x = g_value_get_int (value);
break;
Expand Down Expand Up @@ -895,6 +916,11 @@ gst_aravis_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_enum (value, gst_aravis->exposure_auto);
GST_OBJECT_UNLOCK (gst_aravis);
break;
case PROP_GAMMA:
GST_OBJECT_LOCK (gst_aravis);
g_value_set_double (value, gst_aravis->gamma);
GST_OBJECT_UNLOCK (gst_aravis);
break;
case PROP_OFFSET_X:
g_value_set_int (value, gst_aravis->offset_x);
break;
Expand Down Expand Up @@ -1060,6 +1086,12 @@ gst_aravis_class_init (GstAravisClass * klass)
"Auto Exposure Mode",
GST_TYPE_ARV_AUTO, ARV_AUTO_OFF,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
properties[PROP_GAMMA] =
g_param_spec_double ("gamma",
"Gamma",
"Gamma",
0.0, 3.9, 1.0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
properties[PROP_OFFSET_X] =
g_param_spec_int ("offset-x",
"x Offset",
Expand Down
1 change: 1 addition & 0 deletions gst/gstaravis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ struct _GstAravis {
double exposure_time_us;
ArvAuto exposure_auto;
gboolean exposure_auto_set;
double gamma;

gint offset_x;
gint offset_y;
Expand Down
Loading