{"id":26034,"url":"https://patchwork.libcamera.org/api/patches/26034/?format=json","web_url":"https://patchwork.libcamera.org/patch/26034/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20260129082814.1777779-7-paul.elder@ideasonboard.com>","date":"2026-01-29T08:28:12","name":"[v6,6/8] libcamera: camera: Hook into the LayerManager","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"609df17626e4820baa4a2662c8c0ca052ea3880b","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26034/mbox/","series":[{"id":5753,"url":"https://patchwork.libcamera.org/api/series/5753/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5753","date":"2026-01-29T08:28:06","name":"Add Layers support","version":6,"mbox":"https://patchwork.libcamera.org/series/5753/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26034/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26034/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 D2959C3226\n\tfor ;\n\tThu, 29 Jan 2026 08:28:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 827E761FD2;\n\tThu, 29 Jan 2026 09:28:40 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CB0B961FDE\n\tfor ;\n\tThu, 29 Jan 2026 09:28:35 +0100 (CET)","from neptunite.flets-east.jp (unknown\n\t[IPv6:2404:7a81:160:2100:2eea:f891:1bd7:2691])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2EF28281C;\n\tThu, 29 Jan 2026 09:27:56 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"V8OiMJw5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769675278;\n\tbh=jSvnCM+GocAbdguq/5jzEL8b/HNcAV3hEIrhsSHdWss=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=V8OiMJw5ycrd64D+uRVXN/HWfgrTX0IP6WbC85yaYFfork07rnsjefH6cWJ/h8Fya\n\tEkAwcLi2QVDVre92Z4x7meU5F3z694E0EQw+VYYBNhiXlFMLKw9L5lrFMy7BfYo6EN\n\tcKtO0Gq0zFC7+UAwdE5wqkU2KR3vPkFR51Ic8eKk=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ","Subject":"[PATCH v6 6/8] libcamera: camera: Hook into the LayerManager","Date":"Thu, 29 Jan 2026 17:28:12 +0900","Message-ID":"<20260129082814.1777779-7-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","In-Reply-To":"<20260129082814.1777779-1-paul.elder@ideasonboard.com>","References":"<20260129082814.1777779-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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\" "},"content":"Add hooks into the CameraManager to call into the LayerManager on all\nrelevant public-facing interface of Camera.\n\nThe entry point for each function into the LayerManager has been\nchosen based on the capabilities that we want to expose to Layer\nimplementations.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v6:\n- merge the metadata returned by the layers in requestCompleted into the\n request's metadata to forward it to the application\n\nNo change in v5\n\nNo change in v4\n\nChanges in v3:\n- send the copy of controls returned by LayerManager::start()\n- each Camera now has a LayerController that it can call into,\n shortening each hook call significantly\n\nChanges in v2:\n- move the LayerManager out of Camera into the CameraManager\n- remove hooks for generateConfiguration() and streams()\n- Camera now passes itself into the layer hooks, as it is required for\n the LayerManager to fetch the closure based on the camera to pass to\n each layer\n---\n include/libcamera/internal/camera.h | 4 ++++\n src/libcamera/camera.cpp | 32 ++++++++++++++++++++++++++---\n 2 files changed, 33 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nindex d28cd921a0f9..fdabc460a357 100644\n--- a/include/libcamera/internal/camera.h\n+++ b/include/libcamera/internal/camera.h\n@@ -19,6 +19,8 @@\n \n #include \n \n+#include \"libcamera/internal/layer_manager.h\"\n+\n namespace libcamera {\n \n class CameraControlValidator;\n@@ -78,6 +80,8 @@ private:\n \tstd::atomic state_;\n \n \tstd::unique_ptr validator_;\n+\n+\tstd::unique_ptr layers_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex a2132e61a7bd..4ed9a21726d9 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n #include \n@@ -27,6 +28,8 @@\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_controls.h\"\n+#include \"libcamera/internal/camera_manager.h\"\n+#include \"libcamera/internal/layer_manager.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/request.h\"\n \n@@ -774,18 +777,23 @@ void Camera::Private::setState(State state)\n void Camera::Private::emitBufferCompleted(Request *request, FrameBuffer *buffer)\n {\n \tCamera *camera = _o();\n+\tlayers_->bufferCompleted(request, buffer);\n \tcamera->bufferCompleted.emit(request, buffer);\n }\n \n void Camera::Private::emitRequestCompleted(Request *request)\n {\n \tCamera *camera = _o();\n+\tControlList metadata = layers_->requestCompleted(request);\n+\trequest->_d()->metadata().merge(metadata,\n+\t\t\t\t\tControlList::MergePolicy::OverwriteExisting);\n \tcamera->requestCompleted.emit(request);\n }\n \n void Camera::Private::emitDisconnected()\n {\n \tCamera *camera = _o();\n+\tlayers_->disconnected();\n \tcamera->disconnected.emit();\n }\n \n@@ -976,6 +984,10 @@ Camera::Camera(std::unique_ptr d, const std::string &id,\n \t_d()->id_ = id;\n \t_d()->streams_ = streams;\n \t_d()->validator_ = std::make_unique(this);\n+\t_d()->layers_ =\n+\t\t_d()->pipe()->cameraManager()->_d()->layerManager()->createController(this,\n+\t\t\t\t\t\t\t\t\t\t _d()->properties_,\n+\t\t\t\t\t\t\t\t\t\t _d()->controlInfo_);\n }\n \n Camera::~Camera()\n@@ -1065,6 +1077,8 @@ int Camera::acquire()\n \t\treturn -EBUSY;\n \t}\n \n+\td->layers_->acquire();\n+\n \td->setState(Private::CameraAcquired);\n \n \treturn 0;\n@@ -1097,6 +1111,8 @@ int Camera::release()\n \t\td->pipe_->invokeMethod(&PipelineHandler::release,\n \t\t\t\t ConnectionTypeBlocking, this);\n \n+\td->layers_->release();\n+\n \td->setState(Private::CameraAvailable);\n \n \treturn 0;\n@@ -1114,7 +1130,7 @@ int Camera::release()\n */\n const ControlInfoMap &Camera::controls() const\n {\n-\treturn _d()->controlInfo_;\n+\treturn _d()->layers_->controls();\n }\n \n /**\n@@ -1127,7 +1143,7 @@ const ControlInfoMap &Camera::controls() const\n */\n const ControlList &Camera::properties() const\n {\n-\treturn _d()->properties_;\n+\treturn _d()->layers_->properties();\n }\n \n /**\n@@ -1276,6 +1292,8 @@ int Camera::configure(CameraConfiguration *config)\n \t\td->activeStreams_.insert(stream);\n \t}\n \n+\td->layers_->configure(config, d->controlInfo_);\n+\n \td->setState(Private::CameraConfigured);\n \n \treturn 0;\n@@ -1316,6 +1334,8 @@ std::unique_ptr Camera::createRequest(uint64_t cookie)\n \t/* Associate the request with the pipeline handler. */\n \td->pipe_->registerRequest(request.get());\n \n+\td->layers_->createRequest(cookie, request.get());\n+\n \treturn request;\n }\n \n@@ -1417,6 +1437,8 @@ int Camera::queueRequest(Request *request)\n \t/* Pre-process AeEnable. */\n \tpatchControlList(request->controls());\n \n+\td->layers_->queueRequest(request);\n+\n \td->pipe_->invokeMethod(&PipelineHandler::queueRequest,\n \t\t\t ConnectionTypeQueued, request);\n \n@@ -1453,8 +1475,10 @@ int Camera::start(const ControlList *controls)\n \n \tASSERT(d->requestSequence_ == 0);\n \n+\tControlList *newControls = d->layers_->start(controls);\n+\n \tif (controls) {\n-\t\tControlList copy(*controls);\n+\t\tControlList copy(*newControls);\n \t\tpatchControlList(copy);\n \t\tret = d->pipe_->invokeMethod(&PipelineHandler::start,\n \t\t\t\t\t ConnectionTypeBlocking, this, ©);\n@@ -1505,6 +1529,8 @@ int Camera::stop()\n \n \td->setState(Private::CameraStopping);\n \n+\td->layers_->stop();\n+\n \td->pipe_->invokeMethod(&PipelineHandler::stop, ConnectionTypeBlocking,\n \t\t\t this);\n \n","prefixes":["v6","6/8"]}