{"id":18651,"url":"https://patchwork.libcamera.org/api/1.1/patches/18651/?format=json","web_url":"https://patchwork.libcamera.org/patch/18651/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"","date":"2023-05-26T12:34:04","name":"[libcamera-devel] Add enable_auto_focus option to the GStreamer plugin","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"27cb0f3857d9f71bdbc180aacfc7be2a597fb958","submitter":{"id":164,"url":"https://patchwork.libcamera.org/api/1.1/people/164/?format=json","name":"Cedric Nugteren","email":"cedric@plumerai.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18651/mbox/","series":[{"id":3889,"url":"https://patchwork.libcamera.org/api/1.1/series/3889/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3889","date":"2023-05-26T12:34:04","name":"[libcamera-devel] Add enable_auto_focus option to the GStreamer plugin","version":1,"mbox":"https://patchwork.libcamera.org/series/3889/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18651/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18651/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8F012C31E9\n\tfor ;\n\tFri, 26 May 2023 12:36:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A71D5626FA;\n\tFri, 26 May 2023 14:36:39 +0200 (CEST)","from mail-vs1-xe35.google.com (mail-vs1-xe35.google.com\n\t[IPv6:2607:f8b0:4864:20::e35])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 27C69626F4\n\tfor ;\n\tFri, 26 May 2023 14:34:16 +0200 (CEST)","by mail-vs1-xe35.google.com with SMTP id\n\tada2fe7eead31-437de9222a9so187589137.0\n\tfor ;\n\tFri, 26 May 2023 05:34:16 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1685104599;\n\tbh=W866H5kbCEUwh5fIycfidnPIqYMuYFuG8E7mUh2JP0M=;\n\th=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=F28iPY2fEW8D/BFR2fJjNZ1wVO6rruG+XgYSpFy9IfnuD1Ymywn3KjRUJ1BqARgHD\n\t+PGE/CwjetY9q30S6/z0Kg5JCxJYDM9SBfkVbpJoJkhzavOrlUk8y5ZVax2XcCn3js\n\teZE8J/+1ikER/sD/JuQ9gQvMJ/DlfZcZpLw9kPXENFLDf1I1gDBFDpWzwTzVgrbzly\n\tytb4m1xDWRGfqFD+SpTA8KrY6UPgJuDFRKiUgO08B3GJv+Gc3RyjbMnDZtA74O/35u\n\t//+fnFqtl/ZV5ceJXW/EdDyj18CD+Jw7UmRtPofUuEtWORgAfly6ka1ikE/InamUby\n\t3ShMEtpI+HhpQ==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=plumerai.com; s=google; t=1685104455; x=1687696455;\n\th=to:subject:message-id:date:from:mime-version:from:to:cc:subject\n\t:date:message-id:reply-to;\n\tbh=OULDYyBlH5S8WjkIGirJC3/gxqZyg3VQf80Rh3Ncuj4=;\n\tb=VBd9fNtoYZ5aEIBh0A8oQABMBmJp994Mi8rbgclHyY+W+tQMFw7TVbRCW2htSnTsOh\n\tOrguQ9GIbZ0Xe0UWhAxZ/Nnsj3ojP5WrXmB9ZIbDYqsmLamgdmLqB9kSfjJyhV6RsFTo\n\thxEVAQ0YOgY8a/9EiA5QqfDvmJNh7w4BNmDL8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=plumerai.com\n\theader.i=@plumerai.com header.b=\"VBd9fNto\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1685104455; x=1687696455;\n\th=to:subject:message-id:date:from:mime-version:x-gm-message-state\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=OULDYyBlH5S8WjkIGirJC3/gxqZyg3VQf80Rh3Ncuj4=;\n\tb=M7JqXqCJ8Era3gEVaWXtZuv2qd1NrI6p7i1Fn8NpjstSPsHUKPcyhALgQWQ21ZOm1d\n\tkaMUCR6aHnGBQ7f9woPC5mEJiz8k5mWkVAQU3k7hvBaxa00hNsCbRMNNUGVbdEO8jlvf\n\tn7Yqj+249kpu02q7QyH22K15lDklCq14mg0k6AfKn2vnQ5yu9UBvE370q1r8Ge+QZiU8\n\trDpez52LRH1BC/y9PENrwqMFHGl7zCwyRz1SG3XQzIfEYwjAdlsTNhvA35maaibuxMUC\n\twmuLwsQTZ3rXW8nk2eVcZcUrkwQ4wBUnTU/WAM6EzeWBWL+MPF/kkE0wFp0zSJLpyzBC\n\trqTw==","X-Gm-Message-State":"AC+VfDxftJyiJL6xhVJ4xIVCoXW7YZUpFyb7P52xJ3iFO0cFE0kquNUP\n\tJQ977EENVImoWsZsa+Eypq96PQFFQ8Zxlk7v04rzl/2As7NuOeygFgdmYw==","X-Google-Smtp-Source":"ACHHUZ68FxO/k7Qrw37/x+ddWk/zh2got+j7C7wXrIhd23oLlYftVc9OUZpumaahE8MARptetQ0/j6ei9pTA8ejtsRY=","X-Received":"by 2002:a67:fdd1:0:b0:436:897:4d44 with SMTP id\n\tl17-20020a67fdd1000000b0043608974d44mr352751vsq.23.1685104454782;\n\tFri, 26 May 2023 05:34:14 -0700 (PDT)","MIME-Version":"1.0","Date":"Fri, 26 May 2023 14:34:04 +0200","Message-ID":"","To":"libcamera-devel@lists.libcamera.org","Content-Type":"multipart/alternative; boundary=\"0000000000006ff24f05fc97f414\"","X-Mailman-Approved-At":"Fri, 26 May 2023 14:36:38 +0200","Subject":"[libcamera-devel] [PATCH] Add enable_auto_focus option to the\n\tGStreamer plugin","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Cedric Nugteren via libcamera-devel\n\t","Reply-To":"Cedric Nugteren ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Cameras such as the PiCam 3 support auto-focus, but the GStreamer plugin\nfor libcamera does not enable auto-focus. With this patch auto-focus can\nbe enabled for cameras that support it. By default it is disabled, which\nmeans default behaviour remains unchanged. For cameras that do not\nsupport auto-focus, an error message shows up if it auto-focus is\nenabled.\n\nThis was tested on cameras that do not support auto-focus (e.g. PiCam2)\nand was tested on a camera that does support auto-focus (PiCam3) by\nenabling it, observing auto-focus, and by disabling it or by not setting\nthe option, both resulting in auto-focus being disabled.\n\nSigned-off-by: Cedric Nugteren \n---\n src/gstreamer/gstlibcameraprovider.cpp | 13 ++++++++++++\n src/gstreamer/gstlibcamerasrc.cpp | 29 +++++++++++++++++++++++++-\n 2 files changed, 41 insertions(+), 1 deletion(-)\n\nGST_TYPE_ELEMENT,\n@@ -577,6 +579,18 @@ gst_libcamera_src_task_enter(GstTask *task,\n[[maybe_unused]] GThread *thread,\n gst_flow_combiner_add_pad(self->flow_combiner, srcpad);\n }\n\n+ if (self->enable_auto_focus) {\n+ const ControlInfoMap &infoMap = state->cam_->controls();\n+ if (infoMap.find(&controls::AfMode) != infoMap.end()) {\n+ state->initControls_.set(controls::AfMode, controls::AfModeContinuous);\n+ } else {\n+ GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n+ (\"Failed to enable auto focus\"),\n+ (\"AfMode not found in camera controls, \"\n+ \"please retry with 'enable-auto-focus=false'\"));\n+ }\n+ }\n+\n ret = state->cam_->start(&state->initControls_);\n if (ret) {\n GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n@@ -659,6 +673,9 @@ gst_libcamera_src_set_property(GObject *object, guint\nprop_id,\n g_free(self->camera_name);\n self->camera_name = g_value_dup_string(value);\n break;\n+ case PROP_ENABLE_AUTO_FOCUS:\n+ self->enable_auto_focus = g_value_get_boolean(value);\n+ break;\n default:\n G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n break;\n@@ -676,6 +693,9 @@ gst_libcamera_src_get_property(GObject *object, guint\nprop_id, GValue *value,\n case PROP_CAMERA_NAME:\n g_value_set_string(value, self->camera_name);\n break;\n+ case PROP_ENABLE_AUTO_FOCUS:\n+ g_value_set_boolean(value, self->enable_auto_focus);\n+ break;\n default:\n G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n break;\n@@ -844,4 +864,11 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass\n*klass)\n | G_PARAM_READWRITE\n | G_PARAM_STATIC_STRINGS));\n g_object_class_install_property(object_class, PROP_CAMERA_NAME, spec);\n+ GParamSpec *spec2 = g_param_spec_boolean(\"enable-auto-focus\",\n+ \"Enable auto-focus\",\n+ \"Enable auto-focus if set to true, \"\n+ \"disable it if set to false\",\n+ FALSE, G_PARAM_WRITABLE);\n+ g_object_class_install_property(object_class, PROP_ENABLE_AUTO_FOCUS,\nspec2);\n+\n }","diff":"diff --git a/src/gstreamer/gstlibcameraprovider.cpp\nb/src/gstreamer/gstlibcameraprovider.cpp\nindex 6eb0a0eb..86fa2542 100644\n--- a/src/gstreamer/gstlibcameraprovider.cpp\n+++ b/src/gstreamer/gstlibcameraprovider.cpp\n@@ -31,6 +31,7 @@ GST_DEBUG_CATEGORY_STATIC(provider_debug);\n\n enum {\n PROP_DEVICE_NAME = 1,\n+ PROP_ENABLE_AUTO_FOCUS = 2,\n };\n\n #define GST_TYPE_LIBCAMERA_DEVICE gst_libcamera_device_get_type()\n@@ -40,6 +41,7 @@ G_DECLARE_FINAL_TYPE(GstLibcameraDevice,\ngst_libcamera_device,\n struct _GstLibcameraDevice {\n GstDevice parent;\n gchar *name;\n+ gboolean enable_auto_focus = false;\n };\n\n G_DEFINE_TYPE(GstLibcameraDevice, gst_libcamera_device, GST_TYPE_DEVICE)\n@@ -56,6 +58,7 @@ gst_libcamera_device_create_element(GstDevice *device,\nconst gchar *name)\n g_assert(source);\n\n g_object_set(source, \"camera-name\", GST_LIBCAMERA_DEVICE(device)->name,\nnullptr);\n+ g_object_set(source, \"enable-auto-focus\",\nGST_LIBCAMERA_DEVICE(device)->enable_auto_focus, nullptr);\n\n return source;\n }\n@@ -68,6 +71,7 @@ gst_libcamera_device_reconfigure_element(GstDevice\n*device,\n return FALSE;\n\n g_object_set(element, \"camera-name\", GST_LIBCAMERA_DEVICE(device)->name,\nnullptr);\n+ g_object_set(element, \"enable-auto-focus\",\nGST_LIBCAMERA_DEVICE(device)->enable_auto_focus, nullptr);\n\n return TRUE;\n }\n@@ -82,6 +86,9 @@ gst_libcamera_device_set_property(GObject *object, guint\nprop_id,\n case PROP_DEVICE_NAME:\n device->name = g_value_dup_string(value);\n break;\n+ case PROP_ENABLE_AUTO_FOCUS:\n+ device->enable_auto_focus = g_value_get_boolean(value);\n+ break;\n default:\n G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n break;\n@@ -121,6 +128,12 @@\ngst_libcamera_device_class_init(GstLibcameraDeviceClass *klass)\n (GParamFlags)(G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE |\n G_PARAM_CONSTRUCT_ONLY));\n g_object_class_install_property(object_class, PROP_DEVICE_NAME, pspec);\n+ GParamSpec *spec2 = g_param_spec_boolean(\"enable-auto-focus\",\n+ \"Enable auto-focus\",\n+ \"Enable auto-focus if set to true, \"\n+ \"disable it if set to false\",\n+ FALSE, G_PARAM_WRITABLE);\n+ g_object_class_install_property(object_class, PROP_ENABLE_AUTO_FOCUS,\nspec2);\n }\n\n static GstDevice *\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp\nb/src/gstreamer/gstlibcamerasrc.cpp\nindex a10cbd4f..672ea38a 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -146,6 +146,7 @@ struct _GstLibcameraSrc {\n GstTask *task;\n\n gchar *camera_name;\n+ gboolean enable_auto_focus = false;\n\n GstLibcameraSrcState *state;\n GstLibcameraAllocator *allocator;\n@@ -154,7 +155,8 @@ struct _GstLibcameraSrc {\n\n enum {\n PROP_0,\n- PROP_CAMERA_NAME\n+ PROP_CAMERA_NAME,\n+ PROP_ENABLE_AUTO_FOCUS,\n };\n\n G_DEFINE_TYPE_WITH_CODE(GstLibcameraSrc, gst_libcamera_src,\n","prefixes":["libcamera-devel"]}