From patchwork Tue Mar 2 11:24:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11432 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 E128EBD1F1 for ; Tue, 2 Mar 2021 11:25:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6DC6068A95; Tue, 2 Mar 2021 12:25:12 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ev3//9Cx"; 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 4976A68A93 for ; Tue, 2 Mar 2021 12:25:11 +0100 (CET) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BEB1545D for ; Tue, 2 Mar 2021 12:25:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1614684310; bh=1Jr1HRqmNjKPbyDfK77OIXHUPjfWW7ot7vvigxgGhco=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ev3//9Cx6z5b/CsGQJoJMq36t6LsbbDeGxppqysHhXCI5uVGeGkg+pVqnNvX6tU8N O7ppHFQPEay4dUanLK9Hw4gyt06bNF972t/y9Gx7wCkJ1AEdP8mFqyQ1AYxncFv8/S 1doB5u9radE9qWPGNT+ogjVzHmzdnW1sUd8ujges= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 2 Mar 2021 13:24:37 +0200 Message-Id: <20210302112437.20638-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210131224702.8838-20-laurent.pinchart@ideasonboard.com> References: <20210131224702.8838-20-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1.1 19/20] libcamera: pipeline: simple: Support usage of multiple streams 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" To extend the multi-stream support to runtime operation of the pipeline, expand the converter queue to store multiple output buffers, and update the request queuing and buffer completion handlers accordingly. Signed-off-by: Laurent Pinchart Tested-by: Phi-Bang Nguyen Reviewed-by: Paul Elder Reviewed-by: Kieran Bingham --- Changes since v1: - Add streamIndex() helper - Don't requeue buffer when stopping stream --- src/libcamera/pipeline/simple/simple.cpp | 91 ++++++++++++++---------- 1 file changed, 55 insertions(+), 36 deletions(-) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index ce4e42c3547e..d3e7f7828e96 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -150,6 +150,11 @@ public: int setupFormats(V4L2SubdeviceFormat *format, V4L2Subdevice::Whence whence); + unsigned int streamIndex(const Stream *stream) const + { + return stream - &streams_.front(); + } + struct Entity { MediaEntity *entity; MediaLink *link; @@ -173,7 +178,7 @@ public: std::vector> converterBuffers_; bool useConverter_; - std::queue converterQueue_; + std::queue> converterQueue_; }; class SimpleCameraConfiguration : public CameraConfiguration @@ -764,7 +769,8 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream, * whether the converter is used or not. */ if (data->useConverter_) - return converter_->exportBuffers(0, count, buffers); + return converter_->exportBuffers(data->streamIndex(stream), + count, buffers); else return data->video_->exportBuffers(count, buffers); } @@ -831,25 +837,29 @@ void SimplePipelineHandler::stop(Camera *camera) int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request) { SimpleCameraData *data = cameraData(camera); - Stream *stream = &data->streams_[0]; + int ret; - FrameBuffer *buffer = request->findBuffer(stream); - if (!buffer) { - LOG(SimplePipeline, Error) - << "Attempt to queue request with invalid stream"; - return -ENOENT; - } + std::map buffers; - /* - * If conversion is needed, push the buffer to the converter queue, it - * will be handed to the converter in the capture completion handler. - */ - if (data->useConverter_) { - data->converterQueue_.push(buffer); - return 0; + for (auto &[stream, buffer] : request->buffers()) { + /* + * If conversion is needed, push the buffer to the converter + * queue, it will be handed to the converter in the capture + * completion handler. + */ + if (data->useConverter_) { + buffers.emplace(data->streamIndex(stream), buffer); + } else { + ret = data->video_->queueBuffer(buffer); + if (ret < 0) + return ret; + } } - return data->video_->queueBuffer(buffer); + if (data->useConverter_) + data->converterQueue_.push(std::move(buffers)); + + return 0; } /* ----------------------------------------------------------------------------- @@ -1021,24 +1031,35 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer) * point converting an erroneous buffer. */ if (buffer->metadata().status != FrameMetadata::FrameSuccess) { - if (data->useConverter_) { - /* Requeue the buffer for capture. */ + if (!data->useConverter_) { + /* No conversion, just complete the request. */ + Request *request = buffer->request(); + completeBuffer(request, buffer); + completeRequest(request); + return; + } + + /* + * The converter is in use. Requeue the internal buffer for + * capture (unless the stream is being stopped), and complete + * the request with all the user-facing buffers. + */ + if (buffer->metadata().status != FrameMetadata::FrameCancelled) data->video_->queueBuffer(buffer); - /* - * Get the next user-facing buffer to complete the - * request. - */ - if (data->converterQueue_.empty()) - return; + if (data->converterQueue_.empty()) + return; - buffer = data->converterQueue_.front(); - data->converterQueue_.pop(); + Request *request = nullptr; + for (auto &item : data->converterQueue_.front()) { + FrameBuffer *outputBuffer = item.second; + request = outputBuffer->request(); + completeBuffer(request, outputBuffer); } + data->converterQueue_.pop(); - Request *request = buffer->request(); - completeBuffer(request, buffer); - completeRequest(request); + if (request) + completeRequest(request); return; } @@ -1053,10 +1074,8 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer) return; } - FrameBuffer *output = data->converterQueue_.front(); + converter_->queueBuffers(buffer, data->converterQueue_.front()); data->converterQueue_.pop(); - - converter_->queueBuffers(buffer, { { 0, output } }); return; } @@ -1079,10 +1098,10 @@ void SimplePipelineHandler::converterOutputDone(FrameBuffer *buffer) { ASSERT(activeCamera_); - /* Complete the request. */ + /* Complete the buffer and the request. */ Request *request = buffer->request(); - completeBuffer(request, buffer); - completeRequest(request); + if (completeBuffer(request, buffer)) + completeRequest(request); } REGISTER_PIPELINE_HANDLER(SimplePipelineHandler)