[{"id":27437,"web_url":"https://patchwork.libcamera.org/comment/27437/","msgid":"<168803411801.3585053.12655700296214210658@Monstersaurus>","date":"2023-06-29T10:21:58","subject":"Re: [libcamera-devel] [PATCH v4] gstreamer: Maintain a control list\n\tto track libcamerasrc control properties","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Umang Jain via libcamera-devel (2023-06-29 08:11:21)\n> As more and more libcamera controls get plumbed, more member variables\n> get introduced in struct GstLibcameraSrc. Instead of doing that, now\n> maintain a single ControlList which is more appropriate to keep track\n> of controls that get sets on libcamerasrc.\n\n/sets/set/\n\n> \n> This also brings easy validation of controls set on libcamerasrc. If\n> the controls are not supported by camera, fail negotiation and report\n> what is not supported.\n> \n> The current patch migrates previously introduced control,\n\n/migrates previously/migrates the previously/\n\n> auto-focus-mode, to be set directly in control list.\n\n/in control list/in the control list/\n\n> \n> Signed-off-by: Umang Jain \n> ---\n> src/gstreamer/gstlibcamerasrc.cpp | 39 +++++++++++++++++++++----------\n> src/gstreamer/gstlibcamerasrc.h | 6 ++---\n> 2 files changed, 30 insertions(+), 15 deletions(-)\n> \n> diff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\n> index f764a87a..1f10136b 100644\n> --- a/src/gstreamer/gstlibcamerasrc.cpp\n> +++ b/src/gstreamer/gstlibcamerasrc.cpp\n> @@ -142,7 +142,7 @@ struct _GstLibcameraSrc {\n> GstTask *task;\n> \n> gchar *camera_name;\n> - controls::AfModeEnum auto_focus_mode = controls::AfModeManual;\n> + ControlList *controls;\n> \n> GstLibcameraSrcState *state;\n> GstLibcameraAllocator *allocator;\n> @@ -458,7 +458,9 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,\n> GstLibcameraSrc *self = GST_LIBCAMERA_SRC(user_data);\n> GLibRecLocker lock(&self->stream_lock);\n> GstLibcameraSrcState *state = self->state;\n> + const ControlInfoMap &info_map = state->cam_->controls();\n> GstFlowReturn flow_ret = GST_FLOW_OK;\n> + gboolean supported_ctrl = true;\n> gint ret;\n> \n> g_autoptr(GstStructure) element_caps = gst_structure_new_empty(\"caps\");\n> @@ -575,18 +577,25 @@ gst_libcamera_src_task_enter(GstTask *task, [[maybe_unused]] GThread *thread,\n> gst_flow_combiner_add_pad(self->flow_combiner, srcpad);\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> + /* Check if the controls set on libcamerasrc is supported by the camera. */\n\n/is/are/\n\nReviewed-by: Kieran Bingham \n\n> + for (auto iter = self->controls->begin(); iter != self->controls->end(); iter++) {\n> + if (info_map.find(iter->first) == info_map.end()) {\n> + const ControlIdMap *id_map = self->controls->idMap();\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> + (\"Failed to set %s\", id_map->at(iter->first)->name().c_str()),\n> + (\"%s not supported by this camera, \", id_map->at(iter->first)->name().c_str()));\n> + supported_ctrl = false;\n> }\n> }\n> \n> + if (!supported_ctrl) {\n> + gst_task_stop(task);\n> + flow_ret = GST_FLOW_NOT_NEGOTIATED;\n> + goto done;\n> + }\n> +\n> + state->initControls_.merge(*self->controls);\n> +\n> ret = state->cam_->start(&state->initControls_);\n> if (ret) {\n> GST_ELEMENT_ERROR(self, RESOURCE, SETTINGS,\n> @@ -670,7 +679,8 @@ gst_libcamera_src_set_property(GObject *object, guint prop_id,\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> + self->controls->set(controls::AfMode,\n> + static_cast(g_value_get_enum(value)));\n> break;\n> default:\n> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n> @@ -689,9 +699,11 @@ 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> + case PROP_AUTO_FOCUS_MODE: {\n> + auto auto_focus_mode = self->controls->get(controls::AfMode).value_or(controls::AfModeManual);\n> + g_value_set_enum(value, auto_focus_mode);\n> break;\n> + }\n> default:\n> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);\n> break;\n> @@ -757,6 +769,7 @@ gst_libcamera_src_finalize(GObject *object)\n> g_clear_object(&self->task);\n> g_mutex_clear(&self->state->lock_);\n> g_free(self->camera_name);\n> + delete self->controls;\n> delete self->state;\n> \n> return klass->finalize(object);\n> @@ -782,6 +795,8 @@ gst_libcamera_src_init(GstLibcameraSrc *self)\n> /* C-style friend. */\n> state->src_ = self;\n> self->state = state;\n> +\n> + self->controls = new ControlList(controls::controls, nullptr);\n> }\n> \n> static GstPad *\n> diff --git a/src/gstreamer/gstlibcamerasrc.h b/src/gstreamer/gstlibcamerasrc.h\n> index 0a88ba02..2e6d74cb 100644\n> --- a/src/gstreamer/gstlibcamerasrc.h\n> +++ b/src/gstreamer/gstlibcamerasrc.h\n> @@ -26,17 +26,17 @@ gst_libcamera_auto_focus_get_type()\n> static GType type = 0;\n> static const GEnumValue values[] = {\n> {\n> - static_cast(libcamera::controls::AfModeManual),\n> + libcamera::controls::AfModeManual,\n> \"AfModeManual\",\n> \"manual-focus\",\n> },\n> {\n> - static_cast(libcamera::controls::AfModeAuto),\n> + libcamera::controls::AfModeAuto,\n> \"AfModeAuto\",\n> \"automatic-auto-focus\",\n> },\n> {\n> - static_cast(libcamera::controls::AfModeContinuous),\n> + libcamera::controls::AfModeContinuous,\n> \"AfModeContinuous\",\n> \"continuous-auto-focus\",\n> },\n> -- \n> 2.39.1\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 8559CBE175\n\tfor ;\n\tThu, 29 Jun 2023 10:22:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B89D8628C0;\n\tThu, 29 Jun 2023 12:22:02 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C2D460386\n\tfor ;\n\tThu, 29 Jun 2023 12:22:01 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 925E4836;\n\tThu, 29 Jun 2023 12:21:20 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1688034122;\n\tbh=W6sEfQpAnxXwuTp7dVuLZ9rJAQs/oNyhxld4AtOMkWo=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=BUYVvWPeaNI8S6n1ZLi1oV50+8ZtffkVlcfuGRs2X7ztl9JW1NZd1bH+3Ig6UZoOn\n\th9iQHtlGjrGqoNfQJvmL0nsaFxReveBugq3RP/qxW6zTkSGgP7YT4BslTOCvOdDVc+\n\t86r9IuCpxO2XazUg4+FpOo/sC2Z2yG25dgQBytrYnFwKRDZJuwtZAZcdO8mTMqhjmf\n\thOcLcbaFN6aahYRuFdjUbITANZY9rzpBcpsexk2d86HwJBaW/PNoXU3CwCD6SIkAdo\n\tfq/H0GJauGvDNGArB8ifQ7dNmIlCdg/26bVB+b6ypU0hagbUrlPvgOiem6hpYwsGf3\n\t8GAnZ1/7PEI/Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1688034080;\n\tbh=W6sEfQpAnxXwuTp7dVuLZ9rJAQs/oNyhxld4AtOMkWo=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=obq9SHtV6NeH77L3DYVVxHEfnLoODjR6ycY90BYHvzOLwQoFvxa3Z5mVGrL/I+SFi\n\tAimPiRRjNnc/I80dNkZXW7+kaJIF0Drb0+03PgU00G0pOWVkuhg2O8Xc5SC+8jaJuM\n\t9iczxQRTi9IswDIStRDmf7etF9CbVlC8nn6USLfQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"obq9SHtV\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20230629071121.21459-1-umang.jain@ideasonboard.com>","References":"<20230629071121.21459-1-umang.jain@ideasonboard.com>","To":"Umang Jain ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 29 Jun 2023 11:21:58 +0100","Message-ID":"<168803411801.3585053.12655700296214210658@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v4] gstreamer: Maintain a control list\n\tto track libcamerasrc control properties","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":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"Cedric Nugteren ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]