From patchwork Mon Mar 10 17:03:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 22948 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 8148EC32F1 for ; Mon, 10 Mar 2025 17:03:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2E00D68933; Mon, 10 Mar 2025 18:03:51 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iUqt86vx"; 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 21B62687F0 for ; Mon, 10 Mar 2025 18:03:49 +0100 (CET) Received: from pb-laptop.local (185.221.143.221.nat.pool.zt.hu [185.221.143.221]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 40058227 for ; Mon, 10 Mar 2025 18:02:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1741626132; bh=zpwrqK0qa7go5eW2j8FIYATieYgRU75jxWkvRn+tzQk=; h=From:To:Subject:Date:From; b=iUqt86vx1up9yTlAUVBEeXq4MOenp7F6PgReMHZ9ZnatJV+kVHToSdJQigzuskIWs v9hJyqmbVx6EmA/B0mY8omUhiulX3304YSnG9zROM86CkS2DtvXq/Mg+Aiu7gYHW9S VsyhdjWzz66bQOHUpgzQCRg94FPgPbqUPzUGp140= 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 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 lifetimes of these two `ControlList`s are tied entirely to the request object, so simplify the code by making them member variables instead of manually managing their dynamic lifetime. Signed-off-by: Barnabás Pőcze --- include/libcamera/request.h | 8 ++++---- src/libcamera/request.cpp | 17 ++++------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/include/libcamera/request.h b/include/libcamera/request.h index e214a9d13..3061e2fb0 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -49,8 +49,8 @@ public: void reuse(ReuseFlag flags = Default); - ControlList &controls() { return *controls_; } - ControlList &metadata() { return *metadata_; } + ControlList &controls() { return controls_; } + ControlList &metadata() { return metadata_; } const BufferMap &buffers() const { return bufferMap_; } int addBuffer(const Stream *stream, FrameBuffer *buffer, std::unique_ptr fence = nullptr); @@ -67,8 +67,8 @@ public: private: LIBCAMERA_DISABLE_COPY(Request) - ControlList *controls_; - ControlList *metadata_; + ControlList controls_; + ControlList metadata_; BufferMap bufferMap_; const uint64_t cookie_; diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 6fa1801a0..59fc3fdf9 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -351,16 +351,10 @@ void Request::Private::timeout() */ Request::Request(Camera *camera, uint64_t cookie) : Extensible(std::make_unique(camera)), + controls_(controls::controls, camera->_d()->validator()), + metadata_(controls::controls), /* \todo Add a validator for metadata controls. */ cookie_(cookie), status_(RequestPending) { - controls_ = new ControlList(controls::controls, - camera->_d()->validator()); - - /** - * \todo Add a validator for metadata controls. - */ - metadata_ = new ControlList(controls::controls); - LIBCAMERA_TRACEPOINT(request_construct, this); LOG(Request, Debug) << "Created request - cookie: " << cookie_; @@ -369,9 +363,6 @@ Request::Request(Camera *camera, uint64_t cookie) Request::~Request() { LIBCAMERA_TRACEPOINT(request_destroy, this); - - delete metadata_; - delete controls_; } /** @@ -402,8 +393,8 @@ void Request::reuse(ReuseFlag flags) status_ = RequestPending; - controls_->clear(); - metadata_->clear(); + controls_.clear(); + metadata_.clear(); } /**