{"id":22233,"url":"https://patchwork.libcamera.org/api/patches/22233/?format=json","web_url":"https://patchwork.libcamera.org/patch/22233/","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":"<20241206160747.97176-8-jacopo.mondi@ideasonboard.com>","date":"2024-12-06T16:07:45","name":"[7/8] libcamera: request: Make access to metadata() const","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5e39e555a74fcbb738bdf48b397b58fe9a9c3684","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22233/mbox/","series":[{"id":4858,"url":"https://patchwork.libcamera.org/api/series/4858/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4858","date":"2024-12-06T16:07:38","name":"libcamera: Support partial metadata completion","version":1,"mbox":"https://patchwork.libcamera.org/series/4858/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22233/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22233/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 E32C0BE173\n\tfor ;\n\tFri, 6 Dec 2024 16:08:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9635867E39;\n\tFri, 6 Dec 2024 17:08:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A305E67E28\n\tfor ;\n\tFri, 6 Dec 2024 17:07:57 +0100 (CET)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EFDDF9FC;\n\tFri, 6 Dec 2024 17:07:27 +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=\"BRtquDjr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1733501248;\n\tbh=hcQCGlN1mpUvkybpuZx7ht1VfpPoOAeR0rAg/6KGvW8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=BRtquDjrSx2t0Jzj8d47i7i23/UUNO/C+m5AU6IVLC1BuPaKFPgSCtQlcEtwOfpLp\n\tWOAzNlUZpRC+731jpW2CXyGZ315pDCU2v0HGi5MEdeqFyQ/OBRwIijKcne6xUJlYXh\n\tDA9fO963s8eDRZqm8VbyeMtKb/UCTA8BKSq02jp8=","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi ,\n\tHarvey Yang ,\n\tHan-Lin Chen ","Subject":"[PATCH 7/8] libcamera: request: Make access to metadata() const","Date":"Fri, 6 Dec 2024 17:07:45 +0100","Message-ID":"<20241206160747.97176-8-jacopo.mondi@ideasonboard.com>","X-Mailer":"git-send-email 2.47.1","In-Reply-To":"<20241206160747.97176-1-jacopo.mondi@ideasonboard.com>","References":"<20241206160747.97176-1-jacopo.mondi@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":"Restict access to the metadata list to return a const reference.\n\nProvide a Request::Private::metadata() function for the pipeline handler\nbase class to access the metadata list in RW mode.\n\nAll other users, of the public and internal API alike, can only\naccess metadata through a const reference.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/pipeline_handler.h | 4 ++--\n include/libcamera/internal/request.h | 5 ++++-\n include/libcamera/request.h | 4 +++-\n src/libcamera/pipeline_handler.cpp | 2 +-\n 4 files changed, 10 insertions(+), 5 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 3ca6a0290b2b..b84e5a06d77b 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -74,7 +74,7 @@ public:\n \t\tstd::unordered_set ids;\n \t\tids.insert(&ctrl);\n \n-\t\trequest->metadata().set(ctrl, value);\n+\t\trequest->_d()->metadata().set(ctrl, value);\n \n \t\tCamera *camera = request->_d()->camera();\n \t\tcamera->metadataAvailable.emit(request, ids);\n@@ -92,7 +92,7 @@ public:\n \t\tstd::unordered_set ids;\n \t\tids.insert(&ctrl);\n \n-\t\trequest->metadata().set(ctrl, value);\n+\t\trequest->_d()->metadata().set(ctrl, value);\n \n \t\tCamera *camera = request->_d()->camera();\n \t\tcamera->metadataAvailable.emit(request, ids);\ndiff --git a/include/libcamera/internal/request.h b/include/libcamera/internal/request.h\nindex 98b7c6d6dfdf..1a7128b4259a 100644\n--- a/include/libcamera/internal/request.h\n+++ b/include/libcamera/internal/request.h\n@@ -42,7 +42,8 @@ public:\n \n \tvoid resetMetadata()\n \t{\n-\t\t_o()->metadata().clear();\n+\t\tControlList &data = metadata();\n+\t\tdata.clear();\n \t}\n \n \tvoid prepare(std::chrono::milliseconds timeout = 0ms);\n@@ -52,6 +53,8 @@ private:\n \tfriend class PipelineHandler;\n \tfriend std::ostream &operator<<(std::ostream &out, const Request &r);\n \n+\tControlList &metadata() { return _o()->metadataRW(); }\n+\n \tvoid doCancelRequest();\n \tvoid emitPrepareCompleted();\n \tvoid notifierActivated(FrameBuffer *buffer);\ndiff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex e214a9d13c37..7791080976c2 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -50,7 +50,7 @@ public:\n \tvoid reuse(ReuseFlag flags = Default);\n \n \tControlList &controls() { return *controls_; }\n-\tControlList &metadata() { return *metadata_; }\n+\tconst ControlList &metadata() { return *metadata_; }\n \tconst BufferMap &buffers() const { return bufferMap_; }\n \tint addBuffer(const Stream *stream, FrameBuffer *buffer,\n \t\t std::unique_ptr fence = nullptr);\n@@ -67,6 +67,8 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n+\tControlList &metadataRW() { return *metadata_; }\n+\n \tControlList *controls_;\n \tControlList *metadata_;\n \tBufferMap bufferMap_;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex a69d789116ad..831ac6c87463 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -548,7 +548,7 @@ void PipelineHandler::metadataAvailable(Request *request, const ControlList &met\n \tif (ids.empty())\n \t\treturn;\n \n-\trequest->metadata().merge(metadata);\n+\trequest->_d()->metadata().merge(metadata);\n \n \tCamera *camera = request->_d()->camera();\n \tcamera->metadataAvailable.emit(request, ids);\n","prefixes":["7/8"]}