{"id":23663,"url":"https://patchwork.libcamera.org/api/patches/23663/?format=json","web_url":"https://patchwork.libcamera.org/patch/23663/","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":"<20250626095944.1746345-6-paul.elder@ideasonboard.com>","date":"2025-06-26T09:59:40","name":"[RFC,5/7] libcamera: camera: Hook into the LayerManager","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e00c26f0d25499d434b050642922829d1614454b","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/23663/mbox/","series":[{"id":5251,"url":"https://patchwork.libcamera.org/api/series/5251/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5251","date":"2025-06-26T09:59:35","name":"Add Layers support","version":1,"mbox":"https://patchwork.libcamera.org/series/5251/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23663/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23663/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 DA594BDCBF\n\tfor ;\n\tThu, 26 Jun 2025 10:00:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3335868E09;\n\tThu, 26 Jun 2025 12:00:30 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 267B468DFA\n\tfor ;\n\tThu, 26 Jun 2025 12:00:23 +0200 (CEST)","from neptunite.hamster-moth.ts.net (unknown\n\t[IPv6:2404:7a81:160:2100:258b:9e43:6dff:c39d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4F0C01D54;\n\tThu, 26 Jun 2025 12:00:03 +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=\"ESY7bwnt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1750932004;\n\tbh=V/cY7vn7mRHYdKtgvbI8eScUhW68cgybMgTOSZc8C2k=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ESY7bwntxH6oUjxB5j0czSR4USpS+9GxXJBmnQl4Iih8NqK1JsCNyMlTVQtyXnb2b\n\txSdQnOXOQjvnxXxoPcMjFaXJke2ClMWpOHPE9LcbCGFVPnBSDyq4H4wUr5VJIcntkL\n\tra3QsgvnTC1/cLukcnbjT02ojSC6EZMGJz5pHtrI=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder , kieran.bingham@ideasonboard.com","Subject":"[RFC PATCH 5/7] libcamera: camera: Hook into the LayerManager","Date":"Thu, 26 Jun 2025 18:59:40 +0900","Message-ID":"<20250626095944.1746345-6-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.47.2","In-Reply-To":"<20250626095944.1746345-1-paul.elder@ideasonboard.com>","References":"<20250626095944.1746345-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 is has been\nchosen based on the capabilities that we want to allow to Layer\nimplementations.\n\nSigned-off-by: Paul Elder \n---\n include/libcamera/internal/camera.h | 4 ++++\n src/libcamera/camera.cpp | 26 +++++++++++++++++++++++---\n 2 files changed, 27 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h\nindex 967d4e1693ec..1b9c3da695b6 100644\n--- a/include/libcamera/internal/camera.h\n+++ b/include/libcamera/internal/camera.h\n@@ -18,6 +18,8 @@\n \n #include \n \n+#include \"libcamera/internal/layer_manager.h\"\n+\n namespace libcamera {\n \n class CameraControlValidator;\n@@ -76,6 +78,8 @@ private:\n \tstd::atomic state_;\n \n \tstd::unique_ptr validator_;\n+\n+\tstd::unique_ptr layerManager_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex c3e656cab671..895180452edb 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -741,18 +741,21 @@ void Camera::Private::setState(State state)\n void Camera::Private::emitBufferCompleted(Request *request, FrameBuffer *buffer)\n {\n \tCamera *camera = _o();\n+\tlayerManager_->bufferCompleted(request, buffer);\n \tcamera->bufferCompleted.emit(request, buffer);\n }\n \n void Camera::Private::emitRequestCompleted(Request *request)\n {\n \tCamera *camera = _o();\n+\tlayerManager_->requestCompleted(request);\n \tcamera->requestCompleted.emit(request);\n }\n \n void Camera::Private::emitDisconnected()\n {\n \tCamera *camera = _o();\n+\tlayerManager_->disconnected();\n \tcamera->disconnected.emit();\n }\n \n@@ -943,6 +946,7 @@ 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()->layerManager_ = std::make_unique();\n }\n \n Camera::~Camera()\n@@ -1032,6 +1036,8 @@ int Camera::acquire()\n \t\treturn -EBUSY;\n \t}\n \n+\td->layerManager_->acquire();\n+\n \td->setState(Private::CameraAcquired);\n \n \treturn 0;\n@@ -1064,6 +1070,8 @@ int Camera::release()\n \t\td->pipe_->invokeMethod(&PipelineHandler::release,\n \t\t\t\t ConnectionTypeBlocking, this);\n \n+\td->layerManager_->release();\n+\n \td->setState(Private::CameraAvailable);\n \n \treturn 0;\n@@ -1081,7 +1089,7 @@ int Camera::release()\n */\n const ControlInfoMap &Camera::controls() const\n {\n-\treturn _d()->controlInfo_;\n+\treturn _d()->layerManager_->controls(_d()->controlInfo_);\n }\n \n /**\n@@ -1094,7 +1102,7 @@ const ControlInfoMap &Camera::controls() const\n */\n const ControlList &Camera::properties() const\n {\n-\treturn _d()->properties_;\n+\treturn _d()->layerManager_->properties(_d()->properties_);\n }\n \n /**\n@@ -1110,7 +1118,7 @@ const ControlList &Camera::properties() const\n */\n const std::set &Camera::streams() const\n {\n-\treturn _d()->streams_;\n+\treturn _d()->layerManager_->streams(_d()->streams_);\n }\n \n /**\n@@ -1158,6 +1166,8 @@ std::unique_ptr Camera::generateConfiguration(SpanlayerManager_->generateConfiguration(roles, config.get());\n+\n \treturn config;\n }\n \n@@ -1242,6 +1252,8 @@ int Camera::configure(CameraConfiguration *config)\n \t\td->activeStreams_.insert(stream);\n \t}\n \n+\td->layerManager_->configure(config);\n+\n \td->setState(Private::CameraConfigured);\n \n \treturn 0;\n@@ -1282,6 +1294,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->layerManager_->createRequest(cookie, request.get());\n+\n \treturn request;\n }\n \n@@ -1366,6 +1380,8 @@ int Camera::queueRequest(Request *request)\n \t\t}\n \t}\n \n+\td->layerManager_->queueRequest(request);\n+\n \td->pipe_->invokeMethod(&PipelineHandler::queueRequest,\n \t\t\t ConnectionTypeQueued, request);\n \n@@ -1402,6 +1418,8 @@ int Camera::start(const ControlList *controls)\n \n \tASSERT(d->requestSequence_ == 0);\n \n+\td->layerManager_->start(controls);\n+\n \tret = d->pipe_->invokeMethod(&PipelineHandler::start,\n \t\t\t\t ConnectionTypeBlocking, this, controls);\n \tif (ret)\n@@ -1446,6 +1464,8 @@ int Camera::stop()\n \n \td->setState(Private::CameraStopping);\n \n+\td->layerManager_->stop();\n+\n \td->pipe_->invokeMethod(&PipelineHandler::stop, ConnectionTypeBlocking,\n \t\t\t this);\n \n","prefixes":["RFC","5/7"]}