From patchwork Wed Jul 16 14:20:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 23828 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 5681DC3237 for ; Wed, 16 Jul 2025 14:20:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6CB4368F75; Wed, 16 Jul 2025 16:20:38 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="BNVlvUAQ"; dkim-atps=neutral Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3979168F75 for ; Wed, 16 Jul 2025 16:20:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=94vJOQ8k1NMAB6SFpWN9OzaSYf+V4WRxM9ATfHZ2lDc=; b=BNVlvUAQCjFl9QNTn1Y+VqFSoK pQE/xvSAGvGb5B+eesC3VjOKA6EsDAEPkFxWOyEkBayOcv9Xx8PJ82AXh8OZ4u8au7yNYJKfgh30y dVoFVRZGGYiVY68G+Yl29d1zU4dhPGwBKK2vXV6k/vY6EQJR3Kntvy2TXStzke8KCtu52G7/FQZK6 WdUs/6GTb2suoj4w1jsV1dQ8Yu1Ehq9vUTUsm2xxEJA8TL7y6mh2hanJtCLJbA2rfMnbRBcPrxWIO vohdZ9+7SvWyPPIhhONHgPTzY7X7ytP4zLjtHlNeXv6MbGAVDDruuT8wfpqDZMpgJG7eO3aBTrJGf sb1gAyIw==; Received: from [49.36.69.57] (helo=uajain) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1uc2zm-00HLf5-As; Wed, 16 Jul 2025 16:20:30 +0200 From: Umang Jain To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Robert Mader , Umang Jain Subject: [RFC PATCH 6/6] libcamera: simple: Enable capturing of raw streams Date: Wed, 16 Jul 2025 19:50:27 +0530 Message-ID: <20250716142027.236277-8-uajain@igalia.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250716142027.236277-1-uajain@igalia.com> References: <20250716142027.236277-1-uajain@igalia.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" Enable capturing of raw streams (standalone or in combination with a processed stream). Track the raw stream (if requested) in SimpleCameraData and adapt the buffer handling management accordingly. Signed-off-by: Umang Jain --- src/libcamera/pipeline/simple/simple.cpp | 48 +++++++++++++++++------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 75469e3a..78c9758a 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -326,6 +326,7 @@ public: }; std::vector streams_; + Stream *rawStream_; /* * All entities in the pipeline, from the camera sensor to the video @@ -453,7 +454,7 @@ private: SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe, unsigned int numStreams, MediaEntity *sensor) - : Camera::Private(pipe), streams_(numStreams) + : Camera::Private(pipe), streams_(numStreams), rawStream_(nullptr) { /* * Find the shortest path from the camera sensor to a video capture @@ -926,7 +927,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer) */ if (useConversion_) { if (conversionQueue_.empty()) { - video_->queueBuffer(buffer); + if (!rawStream_) + video_->queueBuffer(buffer); return; } @@ -979,7 +981,14 @@ void SimpleCameraData::tryCompleteRequest(Request *request) void SimpleCameraData::conversionInputDone(FrameBuffer *buffer) { /* Queue the input buffer back for capture. */ - video_->queueBuffer(buffer); + if (!rawStream_) { + video_->queueBuffer(buffer); + } else { + /* Complete the input buffer. */ + Request *request = buffer->request(); + if (pipe()->completeBuffer(request, buffer)) + tryCompleteRequest(request); + } } void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer) @@ -1219,7 +1228,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate() * require any conversion, similar to raw capture use cases). This is * left as a future improvement. */ - needConversion_ = config_.size() > 1; + needConversion_ = config_.size() > 1 + rawCount; for (unsigned int i = 0; i < config_.size(); ++i) { StreamConfiguration &cfg = config_[i]; @@ -1448,11 +1457,15 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) for (unsigned int i = 0; i < config->size(); ++i) { StreamConfiguration &cfg = config->at(i); + bool rawStream = isFormatRaw(cfg.pixelFormat); cfg.setStream(&data->streams_[i]); - if (data->useConversion_ && !isFormatRaw(cfg.pixelFormat)) + if (data->useConversion_ && !rawStream) outputCfgs.push_back(cfg); + + if (rawStream) + data->rawStream_ = &data->streams_[i]; } if (outputCfgs.empty()) @@ -1483,7 +1496,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream, * Export buffers on the converter or capture video node, depending on * whether the converter is used or not. */ - if (data->useConversion_) + if (data->useConversion_ && (stream != data->rawStream_)) return data->converter_ ? data->converter_->exportBuffers(stream, count, buffers) : data->swIsp_->exportBuffers(stream, count, buffers); @@ -1505,8 +1518,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL << pad->entity()->name() << " in use"; return -EBUSY; } - - if (data->useConversion_) { + if (data->useConversion_ && !data->rawStream_) { /* * When using the converter allocate a fixed number of internal * buffers. @@ -1514,8 +1526,16 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL ret = video->allocateBuffers(kNumInternalBuffers, &data->conversionBuffers_); } else { - /* Otherwise, prepare for using buffers from the only stream. */ - Stream *stream = &data->streams_[0]; + /* + * Otherwise, prepare for using buffers from either the raw + * stream((if requested) or the only stream configured. + */ + Stream *stream; + if (data->rawStream_) + stream = data->rawStream_; + else + stream = &data->streams_[0]; + ret = video->importBuffers(stream->configuration().bufferCount); } if (ret < 0) { @@ -1556,8 +1576,10 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL } /* Queue all internal buffers for capture. */ - for (std::unique_ptr &buffer : data->conversionBuffers_) - video->queueBuffer(buffer.get()); + if (!data->rawStream_) { + for (std::unique_ptr &buffer : data->conversionBuffers_) + video->queueBuffer(buffer.get()); + } } return 0; @@ -1608,7 +1630,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request) * queue, it will be handed to the converter in the capture * completion handler. */ - if (data->useConversion_) { + if (data->useConversion_ && (stream != data->rawStream_)) { buffers.emplace(stream, buffer); metadataRequired = !!data->swIsp_; } else {