From patchwork Mon Jun 29 16:30:07 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: 27124 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 E30AEC3303 for ; Mon, 29 Jun 2026 16:31:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8EE5A65FBD; Mon, 29 Jun 2026 18:31:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="huKN8w6Q"; 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 081CB65F5C for ; Mon, 29 Jun 2026 18:30:31 +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 D01391044 for ; Mon, 29 Jun 2026 18:29:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1782750587; bh=I4ClZ5ta5pXE4oYt7eSCkwnoeLv+vpjFH1SChap4SfA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=huKN8w6QUiAsBq0CCs85wiS3pAvXjhwD/RwY2eQ40nZKd/rU/70JY0HFbLXEpnNwv mvsCDOiEmP37CLsxzM357MS41tuhK7eWzpr9OcQZSaNz1bZib5f0ZdEsJvlikWay9c R+JXbHezvP92WR4x8meHfqrCmYuKbpo6q7h2h+uc= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [RFC PATCH v1 44/54] apps: qcam: Use camera buffer pool Date: Mon, 29 Jun 2026 18:30:07 +0200 Message-ID: <20260629163017.863145-45-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" Port to using the camera's buffer pool. Signed-off-by: Barnabás Pőcze --- src/apps/qcam/main_window.cpp | 82 ++++++++++++++--------------------- src/apps/qcam/main_window.h | 1 - 2 files changed, 33 insertions(+), 50 deletions(-) diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp index 59c2aa66cb..a0d5b0798c 100644 --- a/src/apps/qcam/main_window.cpp +++ b/src/apps/qcam/main_window.cpp @@ -466,30 +466,7 @@ int MainWindow::startCapture() Image::fromFrameBuffer(buffer.get(), Image::MapMode::ReadOnly); assert(image != nullptr); mappedBuffers_[buffer.get()] = std::move(image); - - /* Store buffers on the free list. */ - freeBuffers_[stream].enqueue(buffer.get()); - } - } - - /* Create requests and fill them with buffers from the viewfinder. */ - while (!freeBuffers_[vfStream_].isEmpty()) { - FrameBuffer *buffer = freeBuffers_[vfStream_].dequeue(); - - std::unique_ptr request = camera_->createRequest(); - if (!request) { - qWarning() << "Can't create request"; - ret = -ENOMEM; - goto error; - } - - ret = request->addBuffer(vfStream_, buffer); - if (ret < 0) { - qWarning() << "Can't set buffer for request"; - goto error; } - - requests_.push_back(std::move(request)); } /* Start the title timer and the camera. */ @@ -507,13 +484,36 @@ int MainWindow::startCapture() camera_->requestCompleted.connect(this, &MainWindow::requestComplete); + for (StreamConfiguration &config : *config_) { + Stream *stream = config.stream(); + + for (const std::unique_ptr &buffer : allocator_->buffers(stream)) { + ret = camera_->addBuffer(stream, buffer.get()); + if (ret < 0) { + qWarning() << "Can't add buffer"; + goto error_disconnect; + } + } + } + /* Queue all requests. */ - for (std::unique_ptr &request : requests_) { + for ([[maybe_unused]] const auto &buffer : allocator_->buffers(vfStream_)) { + std::unique_ptr request = camera_->createRequest(); + if (!request) { + qWarning() << "Can't create request"; + ret = -ENOMEM; + goto error_disconnect; + } + + request->enableStream(vfStream_, true); + ret = queueRequest(request.get()); if (ret < 0) { qWarning() << "Can't queue request"; goto error_disconnect; } + + requests_.push_back(std::move(request)); } isCapturing_ = true; @@ -529,8 +529,6 @@ error: mappedBuffers_.clear(); - freeBuffers_.clear(); - allocator_.reset(); return ret; @@ -574,7 +572,6 @@ void MainWindow::stopCapture() * but not processed yet. Clear the queue of done buffers to avoid * racing with the event handler. */ - freeBuffers_.clear(); doneQueue_.clear(); titleTimer_.stop(); @@ -661,11 +658,6 @@ void MainWindow::processRaw(FrameBuffer *buffer, memory); } #endif - - { - QMutexLocker locker(&mutex_); - freeBuffers_[rawStream_].enqueue(buffer); - } } /* ----------------------------------------------------------------------------- @@ -710,8 +702,10 @@ void MainWindow::processCapture() if (request->buffers().count(vfStream_)) processViewfinder(request->buffers().at(vfStream_)); - if (request->buffers().count(rawStream_)) - processRaw(request->buffers().at(rawStream_), request->metadata()); + if (auto it = request->buffers().find(rawStream_); it != request->buffers().end()) { + processRaw(it->second, request->metadata()); + camera_->addBuffer(it->first, it->second); + } request->reuse(); QMutexLocker locker(&mutex_); @@ -744,6 +738,8 @@ void MainWindow::processViewfinder(FrameBuffer *buffer) void MainWindow::renderComplete(FrameBuffer *buffer) { + camera_->addBuffer(vfStream_, buffer); + Request *request; { QMutexLocker locker(&mutex_); @@ -753,23 +749,11 @@ void MainWindow::renderComplete(FrameBuffer *buffer) request = freeQueue_.dequeue(); } - request->addBuffer(vfStream_, buffer); + request->enableStream(vfStream_, true); if (captureRaw_) { - FrameBuffer *rawBuffer = nullptr; - - { - QMutexLocker locker(&mutex_); - if (!freeBuffers_[rawStream_].isEmpty()) - rawBuffer = freeBuffers_[rawStream_].dequeue(); - } - - if (rawBuffer) { - request->addBuffer(rawStream_, rawBuffer); - captureRaw_ = false; - } else { - qWarning() << "No free buffer available for RAW capture"; - } + request->enableStream(rawStream_, true); + captureRaw_ = false; } queueRequest(request); } diff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h index 20d369ad23..458c5a63b6 100644 --- a/src/apps/qcam/main_window.h +++ b/src/apps/qcam/main_window.h @@ -119,7 +119,6 @@ private: bool captureRaw_; libcamera::Stream *vfStream_; libcamera::Stream *rawStream_; - std::map> freeBuffers_; QQueue doneQueue_; QQueue freeQueue_; QMutex mutex_; /* Protects freeBuffers_, doneQueue_, and freeQueue_ */