{"id":25342,"url":"https://patchwork.libcamera.org/api/1.1/patches/25342/?format=json","web_url":"https://patchwork.libcamera.org/patch/25342/","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":"<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","date":"2025-12-02T14:49:29","name":"[v3,4/5] libcamera: request: Make controls_ a class instance","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"291e0b6dafa21fe3d0403062923c10c39ebd62d0","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/1.1/people/143/?format=json","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25342/mbox/","series":[{"id":5633,"url":"https://patchwork.libcamera.org/api/1.1/series/5633/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5633","date":"2025-12-02T14:49:25","name":"libcamera: ipc: ControlLists without valid idmap break IPC","version":3,"mbox":"https://patchwork.libcamera.org/series/5633/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25342/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25342/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 5D212C32AF\n\tfor ;\n\tTue, 2 Dec 2025 14:49:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 26F9360D28;\n\tTue, 2 Dec 2025 15:49:46 +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 C027760C94\n\tfor ;\n\tTue, 2 Dec 2025 15:49:36 +0100 (CET)","from [192.168.1.104] (net-93-65-100-155.cust.vodafonedsl.it\n\t[93.65.100.155])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AC1989FC;\n\tTue, 2 Dec 2025 15:47:22 +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=\"YJsLQIwI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764686842;\n\tbh=HoU7dOwRB7cOcAkftp7Y35n6xGnB8hwQfgT5IpZzrlg=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=YJsLQIwIg8kwX3aTlDYSuW0smTHT6f9IEK/Q4wEetHesQ4dmOGT+ihkg3zTylUvIa\n\t8o4MNGZzAiYp3AUSc2Ak62llk9p+XYQqxN8uW32tZDiGOBo/BkiKp9gVGqS6BLHwv9\n\tsL4VDXNpH92QyYGSpUhCLbgR2e1L9FRYGhIorMus=","From":"Jacopo Mondi ","Date":"Tue, 02 Dec 2025 15:49:29 +0100","Subject":"[PATCH v3 4/5] libcamera: request: Make controls_ a class instance","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","References":"<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>","In-Reply-To":"<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi ","X-Mailer":"b4 0.14.2","X-Developer-Signature":"v=1; a=openpgp-sha256; l=2171;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=HoU7dOwRB7cOcAkftp7Y35n6xGnB8hwQfgT5IpZzrlg=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpLvx+JWkkpDLURN9siFv3tTFU0ng3vDfj+nfAa\n\tm9YtnQNyoiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaS78fgAKCRByNAaPFqFW\n\tPHaGEACiKLxp98hbn/aiFVYaBjpo0DlG/X4qkLJaChCCYfXak/hCflI+Xjk0sK4ogouRvgDArcc\n\t0sC1xReSyOcucp4IYmYkIdqcPoNvQOKs/PA/N0w6x4EmOL9ef8eLinlsgbg8j2fWWtSWT4Uoe/P\n\tDAHqljxpJZ9Nd4+9nVp10bhqTKaN/MHzg874Jle2qcWbAFdHWbPEcaKshOtzh8sAcAXQeTiJgkb\n\tDyC3ZY1gdUsLCcmiIV+h+3h63PshBKj+Kt46WaNrDEW4qMragWQUtWH/FgwuMNKeWUqqiw3aKcx\n\tx0DJqQWuEoCdR1/psjlug40zMrPAnFoPbO+k9p8e+LLgH4AjL8QMMSei7MwBi93kBD5a1lD2XAP\n\tnVylKB4QnVVNESPcGP8reEI56GCcBu9p/DPEDGnOfTclV31+8Xz6BFsKF2yfcKjGkotIkWXebgp\n\tflBIDltNq7KduAe07w1gNprfXCrvqkO1CpP0Xt7Pe5xec/u3FmqoXLodpQsJvz7/dsi54ij28xc\n\thoZ0RweksPU3RlQPfkCp3VeFZGjiRGGp0papHQVoDYBhSv4UR7PIvSNQ+lgNmi6sb681oudiq+a\n\tc+ibq5OekqqDGWtmmuRY5b292S2uteQfAj0GmYXMeGj5KZFET1NmBBwraJ8DsZCH1q2AIec9nPv\n\ti640mbeEDE/VGXw==","X-Developer-Key":"i=jacopo.mondi@ideasonboard.com; a=openpgp;\n\tfpr=72392EDC88144A65C701EA9BA5826A2587AD026B","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 controls_ member variable is a pointer, for no specific reason.\nMake it an instance and simplify the class destructor.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/request.h | 4 ++--\n src/libcamera/request.cpp | 7 ++-----\n 2 files changed, 4 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex c9aeddb62680923dc3490a23dc6c3f70f70cc075..290983f613520f136f1d56100c665b0e3124ec02 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -49,7 +49,7 @@ public:\n \n \tvoid reuse(ReuseFlag flags = Default);\n \n-\tControlList &controls() { return *controls_; }\n+\tControlList &controls() { return controls_; }\n \tconst ControlList &metadata() const;\n \tconst BufferMap &buffers() const { return bufferMap_; }\n \tint addBuffer(const Stream *stream, FrameBuffer *buffer,\n@@ -67,7 +67,7 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n-\tControlList *controls_;\n+\tControlList controls_;\n \tBufferMap bufferMap_;\n \n \tconst uint64_t cookie_;\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 0d6c4a0ce9aec5f328c1f66cea43abb37c82544a..57f1f060d5b48bfde97132793e96ef5ce33e252f 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -362,11 +362,9 @@ void Request::Private::timeout()\n */\n Request::Request(Camera *camera, uint64_t cookie)\n \t: Extensible(std::make_unique(camera)),\n+\t controls_(camera->controls(), camera->_d()->validator()),\n \t cookie_(cookie), status_(RequestPending)\n {\n-\tcontrols_ = new ControlList(camera->controls(),\n-\t\t\t\t camera->_d()->validator());\n-\n \tLIBCAMERA_TRACEPOINT(request_construct, this);\n \n \tLOG(Request, Debug) << \"Created request - cookie: \" << cookie_;\n@@ -375,7 +373,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n Request::~Request()\n {\n \tLIBCAMERA_TRACEPOINT(request_destroy, this);\n-\tdelete controls_;\n }\n \n /**\n@@ -406,7 +403,7 @@ void Request::reuse(ReuseFlag flags)\n \n \tstatus_ = RequestPending;\n \n-\tcontrols_->clear();\n+\tcontrols_.clear();\n \t_d()->metadata_.clear();\n }\n \n","prefixes":["v3","4/5"]}