From patchwork Mon Jun 29 16:29:34 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: 27090 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 5CCEDC3261 for ; Mon, 29 Jun 2026 16:30:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C58DC65F84; Mon, 29 Jun 2026 18:30:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cW4UpPIC"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5DEE565F37 for ; Mon, 29 Jun 2026 18:30:23 +0200 (CEST) Received: from pb-laptop.local (185.221.140.128.nat.pool.zt.hu [185.221.140.128]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 21EAE8D4; Mon, 29 Jun 2026 18:29:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1782750580; bh=r3Ov2KlKaxR7pacYvNpNxeN12yMks/mdafjXn3FC/mA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cW4UpPICUqDu943Gtm5G3j3kBQq3agO7JQIumTWAFcgGeHP4GyGhMVQFXxLLHANx/ oh53JX9IJQNsSei7Kk95EJCBs48dfRYpGy37QcCd+Ml+RcAxVh0UaBx1pJHByQUg0c MSHoTNSaOc03VnxmIC4C9kYSxhbHbVr+7/ewjsX8= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi Subject: [RFC PATCH v1 11/54] v4l2: v4l2_camera: Use actually allocated buffer count Date: Mon, 29 Jun 2026 18:29:34 +0200 Message-ID: <20260629163017.863145-12-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260629163017.863145-1-barnabas.pocze@ideasonboard.com> References: <20260629163017.863145-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" Make `V4L2Camera::allocBuffers()` simply create as many requests as the number of buffers allocated instead of taking it as an argument. The two should be the same, so no functional changes intended. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi --- src/v4l2/v4l2_camera.cpp | 8 +++++--- src/v4l2/v4l2_camera.h | 2 +- src/v4l2/v4l2_camera_proxy.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 648578c22b..75428b8adc 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -154,7 +154,7 @@ int V4L2Camera::validateConfiguration(const PixelFormat &pixelFormat, return 0; } -int V4L2Camera::allocBuffers(unsigned int count) +int V4L2Camera::allocBuffers() { Stream *stream = config_->at(0).stream(); @@ -162,7 +162,9 @@ int V4L2Camera::allocBuffers(unsigned int count) if (ret < 0) return ret; - for (unsigned int i = 0; i < count; i++) { + const auto &buffers = bufferAllocator_->buffers(stream); + + for (size_t i = 0; i < buffers.size(); i++) { std::unique_ptr request = camera_->createRequest(i); if (!request) { requestPool_.clear(); @@ -171,7 +173,7 @@ int V4L2Camera::allocBuffers(unsigned int count) requestPool_.push_back(std::move(request)); } - return ret; + return buffers.size(); } void V4L2Camera::freeBuffers() diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 1528f9aad8..8a58169d89 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -54,7 +54,7 @@ public: libcamera::ControlList &controls() { return controls_; } const libcamera::ControlInfoMap &controlInfo() { return camera_->controls(); } - int allocBuffers(unsigned int count); + int allocBuffers(); void freeBuffers(); int getBufferFd(unsigned int index); diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 94c0006cf3..ee44767bd3 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -542,16 +542,16 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf if (ret < 0) return -EINVAL; - setFmtFromConfig(streamConfig_); - - arg->count = streamConfig_.bufferCount; - - ret = vcam_->allocBuffers(arg->count); + ret = vcam_->allocBuffers(); if (ret < 0) { arg->count = 0; return ret; } + arg->count = ret; + + setFmtFromConfig(streamConfig_); + buffers_.resize(arg->count); for (unsigned int i = 0; i < arg->count; i++) { struct v4l2_buffer buf = {};