{"id":22948,"url":"https://patchwork.libcamera.org/api/1.1/patches/22948/?format=json","web_url":"https://patchwork.libcamera.org/patch/22948/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20250310170343.185322-1-barnabas.pocze@ideasonboard.com>","date":"2025-03-10T17:03:43","name":"[v1] libcamera: request: Make `controls_`/`metadata_` members","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2e3b47f714f3e8c051c067905e4447d2466f7354","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/1.1/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22948/mbox/","series":[{"id":5056,"url":"https://patchwork.libcamera.org/api/1.1/series/5056/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5056","date":"2025-03-10T17:03:43","name":"[v1] libcamera: request: Make `controls_`/`metadata_` members","version":1,"mbox":"https://patchwork.libcamera.org/series/5056/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22948/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22948/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 8148EC32F1\n\tfor ;\n\tMon, 10 Mar 2025 17:03:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2E00D68933;\n\tMon, 10 Mar 2025 18:03:51 +0100 (CET)","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 21B62687F0\n\tfor ;\n\tMon, 10 Mar 2025 18:03:49 +0100 (CET)","from pb-laptop.local (185.221.143.221.nat.pool.zt.hu\n\t[185.221.143.221])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 40058227\n\tfor ;\n\tMon, 10 Mar 2025 18:02:12 +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=\"iUqt86vx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1741626132;\n\tbh=zpwrqK0qa7go5eW2j8FIYATieYgRU75jxWkvRn+tzQk=;\n\th=From:To:Subject:Date:From;\n\tb=iUqt86vx1up9yTlAUVBEeXq4MOenp7F6PgReMHZ9ZnatJV+kVHToSdJQigzuskIWs\n\tv9hJyqmbVx6EmA/B0mY8omUhiulX3304YSnG9zROM86CkS2DtvXq/Mg+Aiu7gYHW9S\n\tVsyhdjWzz66bQOHUpgzQCRg94FPgPbqUPzUGp140=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v1] libcamera: request: Make `controls_`/`metadata_` members","Date":"Mon, 10 Mar 2025 18:03:43 +0100","Message-ID":"<20250310170343.185322-1-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","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":"The lifetimes of these two `ControlList`s are tied entirely to the request\nobject, so simplify the code by making them member variables instead of\nmanually managing their dynamic lifetime.\n\nSigned-off-by: Barnabás Pőcze \n---\n include/libcamera/request.h | 8 ++++----\n src/libcamera/request.cpp | 17 ++++-------------\n 2 files changed, 8 insertions(+), 17 deletions(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex e214a9d13..3061e2fb0 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -49,8 +49,8 @@ public:\n \n \tvoid reuse(ReuseFlag flags = Default);\n \n-\tControlList &controls() { return *controls_; }\n-\tControlList &metadata() { return *metadata_; }\n+\tControlList &controls() { return controls_; }\n+\tControlList &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,8 +67,8 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n-\tControlList *controls_;\n-\tControlList *metadata_;\n+\tControlList controls_;\n+\tControlList metadata_;\n \tBufferMap bufferMap_;\n \n \tconst uint64_t cookie_;\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 6fa1801a0..59fc3fdf9 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -351,16 +351,10 @@ void Request::Private::timeout()\n */\n Request::Request(Camera *camera, uint64_t cookie)\n \t: Extensible(std::make_unique(camera)),\n+\t controls_(controls::controls, camera->_d()->validator()),\n+\t metadata_(controls::controls), /* \\todo Add a validator for metadata controls. */\n \t cookie_(cookie), status_(RequestPending)\n {\n-\tcontrols_ = new ControlList(controls::controls,\n-\t\t\t\t camera->_d()->validator());\n-\n-\t/**\n-\t * \\todo Add a validator for metadata controls.\n-\t */\n-\tmetadata_ = new ControlList(controls::controls);\n-\n \tLIBCAMERA_TRACEPOINT(request_construct, this);\n \n \tLOG(Request, Debug) << \"Created request - cookie: \" << cookie_;\n@@ -369,9 +363,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n Request::~Request()\n {\n \tLIBCAMERA_TRACEPOINT(request_destroy, this);\n-\n-\tdelete metadata_;\n-\tdelete controls_;\n }\n \n /**\n@@ -402,8 +393,8 @@ void Request::reuse(ReuseFlag flags)\n \n \tstatus_ = RequestPending;\n \n-\tcontrols_->clear();\n-\tmetadata_->clear();\n+\tcontrols_.clear();\n+\tmetadata_.clear();\n }\n \n /**\n","prefixes":["v1"]}