From patchwork Thu Jun 18 12:38:39 2026 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: 26984 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 EC581C3318 for ; Thu, 18 Jun 2026 12:39:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6D71665716; Thu, 18 Jun 2026 14:39:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hKC25zwB"; 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 E294B62B32 for ; Thu, 18 Jun 2026 14:38:52 +0200 (CEST) Received: from pb-laptop.local (185.182.214.63.nat.pool.zt.hu [185.182.214.63]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E7A81DF3 for ; Thu, 18 Jun 2026 14:38:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1781786298; bh=rJmuAswBm1gnfX4cU7FIDte9K62dIwjJE69ylzW2nig=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hKC25zwBLcPRZJ3MjB4kL9Hyg7jqxl8oaWb9E9bWydIfYoHbKASeqni2+HZvNy1RV biS/XYCL99sdbx7e0a0cXD8UhyGpSNKPWarXD/wYXwXAZSvEyiBU5B6zFci+Rly9nZ jXmivVIKQcip1eu8OFtqMgxLdhJkFMSRFtTU+dHk= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [RFC PATCH v1 22/27] v4l2: v4l2_camera: Avoid a level of indirection Date: Thu, 18 Jun 2026 14:38:39 +0200 Message-ID: <20260618123844.656396-23-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260618123844.656396-1-barnabas.pocze@ideasonboard.com> References: <20260618123844.656396-1-barnabas.pocze@ideasonboard.com> 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" Convert the `completedBuffers_` container to store the items directly and not via an `std::unique_ptr`. Signed-off-by: Barnabás Pőcze --- src/v4l2/v4l2_camera.cpp | 11 ++++------- src/v4l2/v4l2_camera.h | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 412ab4ea67..648578c22b 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -70,11 +70,10 @@ void V4L2Camera::unbind() std::vector V4L2Camera::completedBuffers() { - std::vector v; - MutexLocker lock(bufferLock_); - for (std::unique_ptr &metadata : completedBuffers_) - v.push_back(*metadata.get()); + std::vector v(std::move_iterator(completedBuffers_.begin()), + std::move_iterator(completedBuffers_.end())); + completedBuffers_.clear(); return v; @@ -88,9 +87,7 @@ void V4L2Camera::requestComplete(Request *request) /* We only have one stream at the moment. */ bufferLock_.lock(); FrameBuffer *buffer = request->buffers().begin()->second; - std::unique_ptr metadata = - std::make_unique(request->cookie(), buffer->metadata()); - completedBuffers_.push_back(std::move(metadata)); + completedBuffers_.emplace_back(request->cookie(), buffer->metadata()); bufferLock_.unlock(); uint64_t data = 1; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 3d09ae7d60..1528f9aad8 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -85,7 +85,7 @@ private: std::vector> requestPool_; std::deque pendingRequests_; - std::deque> completedBuffers_ + std::deque completedBuffers_ LIBCAMERA_TSA_GUARDED_BY(bufferLock_); int efd_;