[{"id":37171,"web_url":"https://patchwork.libcamera.org/comment/37171/","msgid":"<42bf3490-084c-4d97-92f4-1ff455244064@ideasonboard.com>","date":"2025-12-02T18:24:10","subject":"Re: [PATCH v3 4/5] libcamera: request: Make controls_ a class\n\tinstance","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2025. 12. 02. 15:49 keltezéssel, Jacopo Mondi írta:\n> The controls_ member variable is a pointer, for no specific reason.\n> Make it an instance and simplify the class destructor.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n\nReviewed-by: Barnabás Pőcze \n\n\n> include/libcamera/request.h | 4 ++--\n> src/libcamera/request.cpp | 7 ++-----\n> 2 files changed, 4 insertions(+), 7 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 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_;\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 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>","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 120CEC3257\n\tfor ;\n\tTue, 2 Dec 2025 18:24:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4D23660D2F;\n\tTue, 2 Dec 2025 19:24:16 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 29F5460C8A\n\tfor ;\n\tTue, 2 Dec 2025 19:24:15 +0100 (CET)","from [192.168.33.23] (185.182.214.104.nat.pool.zt.hu\n\t[185.182.214.104])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 520083E6;\n\tTue, 2 Dec 2025 19:22:00 +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=\"NldMF8Do\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764699720;\n\tbh=WU4l5/3oIsF+fUe4MmVS5vd5WLAhCu2cxT9B8b6Yp8k=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=NldMF8DoerIVbBwgUw+YOEvwcLDW6wDdV7+KrPZcccHf0TbpICS0z161IjxuWQHZK\n\t+fFAAf5dzr0SyYZqI+xJP2bo3dN4NpdAJInK+FPhnRU+iFGx+J8Jt/0puK1ZacP2or\n\tiFDcmSk/qzb5xGcPDfgqbpJJlFJgJ4PF88eo2Eo0=","Message-ID":"<42bf3490-084c-4d97-92f4-1ff455244064@ideasonboard.com>","Date":"Tue, 2 Dec 2025 19:24:10 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v3 4/5] libcamera: request: Make controls_ a class\n\tinstance","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>\n\t<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","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\" "}},{"id":37380,"web_url":"https://patchwork.libcamera.org/comment/37380/","msgid":"","date":"2025-12-15T11:58:47","subject":"Re: [PATCH v3 4/5] libcamera: request: Make controls_ a class\n\tinstance","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/people/156/","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"content":"Hi Jacopo\n\nOn 02/12/2025 14:49, Jacopo Mondi wrote:\n> The controls_ member variable is a pointer, for no specific reason.\n> Make it an instance and simplify the class destructor.\n\nOh it's both constructor and destructor being simplified; I missed the delete metadata_ in the last \npatch.\n\nAnyway\n\nReviewed-by: Daniel Scally \n\n> \n> Signed-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(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 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_;\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 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>","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 87A85C3257\n\tfor ;\n\tMon, 15 Dec 2025 11:58:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 41E356196C;\n\tMon, 15 Dec 2025 12:58:51 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2585E615B2\n\tfor ;\n\tMon, 15 Dec 2025 12:58:50 +0100 (CET)","from [192.168.0.43]\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 46EB4C66;\n\tMon, 15 Dec 2025 12:58:45 +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=\"gOMRh8r/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1765799925;\n\tbh=c76IBtAXgRouO2QzQCRjdNl3/viISWk7UAZJQHDbZN8=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=gOMRh8r/BuT1GC/WKjNphTAGjjPpmc+QU/m3+7PWuUBH+5STDemYNOmWMVLrQnNkY\n\tMQEg9tj0mTvE0Ebcr79qomzhdxgoJJNGXnJZkU7M5VGtfhjBTt2ZP/kNIXkqJTDeSg\n\tAuGXmEXb6WzztBIdVggGfTP8KfmuILL6rj2od+AU=","Message-ID":"","Date":"Mon, 15 Dec 2025 11:58:47 +0000","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v3 4/5] libcamera: request: Make controls_ a class\n\tinstance","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>\n\t<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","Content-Language":"en-US","From":"Dan Scally ","In-Reply-To":"<20251202-cam-control-override-v3-4-eacab052798d@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","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\" "}}]