From patchwork Tue Dec 2 14:49:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25342 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 5D212C32AF for ; Tue, 2 Dec 2025 14:49:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 26F9360D28; Tue, 2 Dec 2025 15:49:46 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YJsLQIwI"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C027760C94 for ; Tue, 2 Dec 2025 15:49:36 +0100 (CET) Received: from [192.168.1.104] (net-93-65-100-155.cust.vodafonedsl.it [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AC1989FC; Tue, 2 Dec 2025 15:47:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764686842; bh=HoU7dOwRB7cOcAkftp7Y35n6xGnB8hwQfgT5IpZzrlg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YJsLQIwIg8kwX3aTlDYSuW0smTHT6f9IEK/Q4wEetHesQ4dmOGT+ihkg3zTylUvIa 8o4MNGZzAiYp3AUSc2Ak62llk9p+XYQqxN8uW32tZDiGOBo/BkiKp9gVGqS6BLHwv9 sL4VDXNpH92QyYGSpUhCLbgR2e1L9FRYGhIorMus= 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 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; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=HoU7dOwRB7cOcAkftp7Y35n6xGnB8hwQfgT5IpZzrlg=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpLvx+JWkkpDLURN9siFv3tTFU0ng3vDfj+nfAa m9YtnQNyoiJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaS78fgAKCRByNAaPFqFW PHaGEACiKLxp98hbn/aiFVYaBjpo0DlG/X4qkLJaChCCYfXak/hCflI+Xjk0sK4ogouRvgDArcc 0sC1xReSyOcucp4IYmYkIdqcPoNvQOKs/PA/N0w6x4EmOL9ef8eLinlsgbg8j2fWWtSWT4Uoe/P DAHqljxpJZ9Nd4+9nVp10bhqTKaN/MHzg874Jle2qcWbAFdHWbPEcaKshOtzh8sAcAXQeTiJgkb DyC3ZY1gdUsLCcmiIV+h+3h63PshBKj+Kt46WaNrDEW4qMragWQUtWH/FgwuMNKeWUqqiw3aKcx x0DJqQWuEoCdR1/psjlug40zMrPAnFoPbO+k9p8e+LLgH4AjL8QMMSei7MwBi93kBD5a1lD2XAP nVylKB4QnVVNESPcGP8reEI56GCcBu9p/DPEDGnOfTclV31+8Xz6BFsKF2yfcKjGkotIkWXebgp flBIDltNq7KduAe07w1gNprfXCrvqkO1CpP0Xt7Pe5xec/u3FmqoXLodpQsJvz7/dsi54ij28xc hoZ0RweksPU3RlQPfkCp3VeFZGjiRGGp0papHQVoDYBhSv4UR7PIvSNQ+lgNmi6sb681oudiq+a c+ibq5OekqqDGWtmmuRY5b292S2uteQfAj0GmYXMeGj5KZFET1NmBBwraJ8DsZCH1q2AIec9nPv i640mbeEDE/VGXw== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The controls_ member variable is a pointer, for no specific reason. Make it an instance and simplify the class destructor. Signed-off-by: Jacopo Mondi Reviewed-by: Barnabás Pőcze --- include/libcamera/request.h | 4 ++-- src/libcamera/request.cpp | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/libcamera/request.h b/include/libcamera/request.h index c9aeddb62680923dc3490a23dc6c3f70f70cc075..290983f613520f136f1d56100c665b0e3124ec02 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -49,7 +49,7 @@ public: void reuse(ReuseFlag flags = Default); - ControlList &controls() { return *controls_; } + ControlList &controls() { return controls_; } const ControlList &metadata() const; const BufferMap &buffers() const { return bufferMap_; } int addBuffer(const Stream *stream, FrameBuffer *buffer, @@ -67,7 +67,7 @@ public: private: LIBCAMERA_DISABLE_COPY(Request) - ControlList *controls_; + ControlList controls_; BufferMap bufferMap_; const uint64_t cookie_; diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 0d6c4a0ce9aec5f328c1f66cea43abb37c82544a..57f1f060d5b48bfde97132793e96ef5ce33e252f 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -362,11 +362,9 @@ void Request::Private::timeout() */ Request::Request(Camera *camera, uint64_t cookie) : Extensible(std::make_unique(camera)), + controls_(camera->controls(), camera->_d()->validator()), cookie_(cookie), status_(RequestPending) { - controls_ = new ControlList(camera->controls(), - camera->_d()->validator()); - LIBCAMERA_TRACEPOINT(request_construct, this); LOG(Request, Debug) << "Created request - cookie: " << cookie_; @@ -375,7 +373,6 @@ Request::Request(Camera *camera, uint64_t cookie) Request::~Request() { LIBCAMERA_TRACEPOINT(request_destroy, this); - delete controls_; } /** @@ -406,7 +403,7 @@ void Request::reuse(ReuseFlag flags) status_ = RequestPending; - controls_->clear(); + controls_.clear(); _d()->metadata_.clear(); }