[{"id":31796,"web_url":"https://patchwork.libcamera.org/comment/31796/","msgid":"<172926087505.3353069.3343962563537333016@ping.linuxembedded.co.uk>","date":"2024-10-18T14:14:35","subject":"Re: [PATCH v3 2/3] gstreamer: Remove auto-focus-mode property from\n\tlibcamerasrc","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jaslo Ziska (2024-10-17 18:04:14)\n> In preparation for generic support of all libcamera controls, remove the\n> manual handling of the auto-focus-mode property from the libcamerasrc\n> element.\n> \n> Signed-off-by: Jaslo Ziska \n> Reviewed-by: Laurent Pinchart \n\n\none out ...\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/gstreamer/gstlibcamerasrc.cpp | 28 ----------------------------\n> src/gstreamer/gstlibcamerasrc.h | 31 -------------------------------\n> 2 files changed, 59 deletions(-)\n> \n> diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\n> index 912a8d55..40b787c8 100644\n> --- a/src/gstreamer/gstlibcamerasrc.cpp\n> +++ b/src/gstreamer/gstlibcamerasrc.cpp\n> @@ -142,7 +142,6 @@ struct _GstLibcameraSrc {\n> GstTask *task;\n> \n> gchar *camera_name;\n> - controls::AfModeEnum auto_focus_mode = controls::AfModeManual;\n> \n> std::atomic pending_eos;\n> \n> @@ -154,7 +153,6 @@ struct _GstLibcameraSrc {\n> enum {\n> PROP_0,\n> PROP_CAMERA_NAME,\n> - PROP_AUTO_FOCUS_MODE,\n> };\n> \n> static void gst_libcamera_src_child_proxy_init(gpointer g_iface,\n> @@ -663,18 +661,6 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,\n> gst_pad_push_event(srcpad, gst_event_new_segment(&segment));\n> }\n> \n> - if (self->auto_focus_mode != controls::AfModeManual) {\n> - const ControlInfoMap &infoMap = state->cam_->controls();\n> - if (infoMap.find(&controls::AfMode) != infoMap.end()) {\n> - state->initControls_.set(controls::AfMode, self->auto_focus_mode);\n> - } else {\n> - GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n> - (\"Failed to enable auto focus\"),\n> - (\"AfMode not supported by this camera, \"\n> - \"please retry with 'auto-focus-mode=AfModeManual'\"));\n> - }\n> - }\n> -\n> ret = state->cam_->start(&state->initControls_);\n> if (ret) {\n> GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n> @@ -742,9 +728,6 @@ gst_libcamera_src_set_property(GObject *object, guint prop_id,\n> g_free(self->camera_name);\n> self->camera_name = g_value_dup_string(value);\n> break;\n> - case PROP_AUTO_FOCUS_MODE:\n> - self->auto_focus_mode = static_cast(g_value_get_enum(value));\n> - break;\n> default:\n> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n> break;\n> @@ -762,9 +745,6 @@ gst_libcamera_src_get_property(GObject *object, guint prop_id, GValue *value,\n> case PROP_CAMERA_NAME:\n> g_value_set_string(value, self->camera_name);\n> break;\n> - case PROP_AUTO_FOCUS_MODE:\n> - g_value_set_enum(value, static_cast(self->auto_focus_mode));\n> - break;\n> default:\n> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n> break;\n> @@ -967,14 +947,6 @@ gst_libcamera_src_class_init(GstLibcameraSrcClass *klass)\n> | G_PARAM_STATIC_STRINGS));\n> g_object_class_install_property(object_class, PROP_CAMERA_NAME, spec);\n> \n> - spec = g_param_spec_enum(\"auto-focus-mode\",\n> - \"Set auto-focus mode\",\n> - \"Available options: AfModeManual, \"\n> - \"AfModeAuto or AfModeContinuous.\",\n> - gst_libcamera_auto_focus_get_type(),\n> - static_cast(controls::AfModeManual),\n> - G_PARAM_WRITABLE);\n> - g_object_class_install_property(object_class, PROP_AUTO_FOCUS_MODE, spec);\n> }\n> \n> /* GstChildProxy implementation */\n> diff --git a/src/gstreamer/gstlibcamerasrc.h b/src/gstreamer/gstlibcamerasrc.h\n> index fd1f8193..a27db9ca 100644\n> --- a/src/gstreamer/gstlibcamerasrc.h\n> +++ b/src/gstreamer/gstlibcamerasrc.h\n> @@ -8,8 +8,6 @@\n> \n> #pragma once\n> \n> -#include \n> -\n> #include \n> \n> G_BEGIN_DECLS\n> @@ -19,32 +17,3 @@ G_DECLARE_FINAL_TYPE(GstLibcameraSrc, gst_libcamera_src,\n> GST_LIBCAMERA, SRC, GstElement)\n> \n> G_END_DECLS\n> -\n> -inline GType\n> -gst_libcamera_auto_focus_get_type()\n> -{\n> - static GType type = 0;\n> - static const GEnumValue values[] = {\n> - {\n> - static_cast(libcamera::controls::AfModeManual),\n> - \"AfModeManual\",\n> - \"manual-focus\",\n> - },\n> - {\n> - static_cast(libcamera::controls::AfModeAuto),\n> - \"AfModeAuto\",\n> - \"automatic-auto-focus\",\n> - },\n> - {\n> - static_cast(libcamera::controls::AfModeContinuous),\n> - \"AfModeContinuous\",\n> - \"continuous-auto-focus\",\n> - },\n> - { 0, NULL, NULL }\n> - };\n> -\n> - if (!type)\n> - type = g_enum_register_static(\"GstLibcameraAutoFocus\", values);\n> -\n> - return type;\n> -}\n> -- \n> 2.46.2\n>","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 E5CB2C32AF\n\tfor ;\n\tFri, 18 Oct 2024 14:14:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A04876538B;\n\tFri, 18 Oct 2024 16:14:38 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7E0F1633C6\n\tfor ;\n\tFri, 18 Oct 2024 16:14:37 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C87BD514;\n\tFri, 18 Oct 2024 16:12:53 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ElBxOt/3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729260773;\n\tbh=EncDlP6Er6VqbA07uO2QAzdHBgIexxSrAwQEU61ARZc=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=ElBxOt/3aXo4yWNz9JTeZDWdFVuOh3RZai5+p76vNrG53GmPxN+hiNv7SWb7w18gd\n\tXXWShsklMISd89JOZgvc+OvEmgbCQClYOLIhiaAtvt2NSzzzxfbIobYdl2GaEFdf7O\n\t3davSV+0ID87XlixnI0uAm8S9RI/NY4itsCTrrjc=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20241017172331.16377-3-jaslo@ziska.de>","References":"<20241017172331.16377-1-jaslo@ziska.de>\n\t<20241017172331.16377-3-jaslo@ziska.de>","Subject":"Re: [PATCH v3 2/3] gstreamer: Remove auto-focus-mode property from\n\tlibcamerasrc","From":"Kieran Bingham ","Cc":"Jaslo Ziska ,\n\tLaurent Pinchart ","To":"Jaslo Ziska , libcamera-devel@lists.libcamera.org","Date":"Fri, 18 Oct 2024 15:14:35 +0100","Message-ID":"<172926087505.3353069.3343962563537333016@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]