summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaslo Ziska <jaslo@ziska.de>2024-10-21 18:45:32 +0200
committerKieran Bingham <kieran.bingham@ideasonboard.com>2024-11-05 16:28:09 +0000
commitaebc8742b006d7b4edce34bee93aed9a36aeb466 (patch)
tree4545f4ff4fef87ef540639d218aa8d880c5361dc
parent327b0d16a1c7a352cf4a92303134dd2b57b59e6f (diff)
gstreamer: Remove auto-focus-mode property from libcamerasrc
In preparation for generic support of all libcamera controls, remove the manual handling of the auto-focus-mode property from the libcamerasrc element. Signed-off-by: Jaslo Ziska <jaslo@ziska.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/gstreamer/gstlibcamerasrc.cpp28
-rw-r--r--src/gstreamer/gstlibcamerasrc.h31
2 files changed, 0 insertions, 59 deletions
diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp
index 912a8d55..40b787c8 100644
--- a/src/gstreamer/gstlibcamerasrc.cpp
+++ b/src/gstreamer/gstlibcamerasrc.cpp
@@ -142,7 +142,6 @@ struct _GstLibcameraSrc {
GstTask *task;
gchar *camera_name;
- controls::AfModeEnum auto_focus_mode = controls::AfModeManual;
std::atomic<GstEvent *> pending_eos;
@@ -154,7 +153,6 @@ struct _GstLibcameraSrc {
enum {
PROP_0,
PROP_CAMERA_NAME,
- PROP_AUTO_FOCUS_MODE,
};
static void gst_libcamera_src_child_proxy_init(gpointer g_iface,
@@ -663,18 +661,6 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,
gst_pad_push_event(srcpad, gst_event_new_segment(&segment));
}
- if (self->auto_focus_mode != controls::AfModeManual) {
- const ControlInfoMap &infoMap = state->cam_->controls();
- if (infoMap.find(&controls::AfMode) != infoMap.end()) {
- state->initControls_.set(controls::AfMode, self->auto_focus_mode);
- } else {
- GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,
- ("Failed to enable auto focus"),
- ("AfMode not supported by this camera, "
- "please retry with 'auto-focus-mode=AfModeManual'"));
- }
- }
-
ret = state->cam_->start(&state->initControls_);
if (ret) {
GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,
@@ -742,9 +728,6 @@ gst_libcamera_src_set_property(GObject *object, guint prop_id,
g_free(self->camera_name);
self->camera_name = g_value_dup_string(value);
break;
- case PROP_AUTO_FOCUS_MODE:
- self->auto_focus_mode = static_cast<controls::AfModeEnum>(g_value_get_enum(value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -762,9 +745,6 @@ gst_libcamera_src_get_property(GObject *object, guint prop_id, GValue *value,
case PROP_CAMERA_NAME:
g_value_set_string(value, self->camera_name);
break;
- case PROP_AUTO_FOCUS_MODE:
- g_value_set_enum(value, static_cast<gint>(self->auto_focus_mode));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -967,14 +947,6 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass)
| G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_CAMERA_NAME, spec);
- spec = g_param_spec_enum("auto-focus-mode",
- "Set auto-focus mode",
- "Available options: AfModeManual, "
- "AfModeAuto or AfModeContinuous.",
- gst_libcamera_auto_focus_get_type(),
- static_cast<gint>(controls::AfModeManual),
- G_PARAM_WRITABLE);
- g_object_class_install_property(object_class, PROP_AUTO_FOCUS_MODE, spec);
}
/* GstChildProxy implementation */
diff --git a/src/gstreamer/gstlibcamerasrc.h b/src/gstreamer/gstlibcamerasrc.h
index fd1f8193..a27db9ca 100644
--- a/src/gstreamer/gstlibcamerasrc.h
+++ b/src/gstreamer/gstlibcamerasrc.h
@@ -8,8 +8,6 @@
#pragma once
-#include <libcamera/control_ids.h>
-
#include <gst/gst.h>
G_BEGIN_DECLS
@@ -19,32 +17,3 @@ G_DECLARE_FINAL_TYPE(GstLibcameraSrc, gst_libcamera_src,
GST_LIBCAMERA, SRC, GstElement)
G_END_DECLS
-
-inline GType
-gst_libcamera_auto_focus_get_type()
-{
- static GType type = 0;
- static const GEnumValue values[] = {
- {
- static_cast<gint>(libcamera::controls::AfModeManual),
- "AfModeManual",
- "manual-focus",
- },
- {
- static_cast<gint>(libcamera::controls::AfModeAuto),
- "AfModeAuto",
- "automatic-auto-focus",
- },
- {
- static_cast<gint>(libcamera::controls::AfModeContinuous),
- "AfModeContinuous",
- "continuous-auto-focus",
- },
- { 0, NULL, NULL }
- };
-
- if (!type)
- type = g_enum_register_static("GstLibcameraAutoFocus", values);
-
- return type;
-}