From patchwork Thu Apr 27 07:24:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18564 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 7607DBDCBD for ; Thu, 27 Apr 2023 07:24:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E9BB0627D6; Thu, 27 Apr 2023 09:24:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1682580261; bh=cV30pY9HPnIxDLeEW4v2+4UceeCY5KVE5v0KTKlX4Kg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=EyoRD1q7Rn7MDqlzIBY/sFlvIt3PkHFlIo4JyP5MiwVYHYu6aERu8NpLcILB+9DIE rO833wqILZWHYSwUwdUWZzcKN0XA2XsHZ3L+S9WWHKjQO8xC2Or41dsbXLelCF5K4X q+QWXZHEaLpnAhRpbodGi67iLICf5hiBzn5UCl5cDy06mZ3SGin2o8vVAyRe2bmapl 4B6vhgtMiyGONKKbe9hcI8F5T4QzAPJ66t7rFN9NBJtWyMOW6bdp+oHhpbOtglAgbk m1U9CXz2t7ASB9VMhpldeXISS8cUvpMRbxBrizWJ3DNMDTzKlmIssT3IhztLjbq5gw NEpS/ypo4NyGw== Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EDBE9627D1 for ; Thu, 27 Apr 2023 09:24:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KANsOWNA"; dkim-atps=neutral Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-304935cc79bso2574878f8f.2 for ; Thu, 27 Apr 2023 00:24:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1682580259; x=1685172259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BYrl5h9ztwHlTXi7KX0jyzpTEG7xDFddx1GKX0YN0OY=; b=KANsOWNAPAo++FG1GVWOAA2LsGsbJIdUo0PsuVRSbwStt8KEo0wARQ2n9Hhe/T8io3 Qh5KTw/in78jwHzDGpnE5WygTfM6//bnc6jYP6mnP4noZjCEHcQayqj0szr/BlyeFq28 FpqgRJJwno1OFT54mSyAASHPB1bdT2eysCT0QHgQ8/1S1glVVU8n3LSeh+LodjQRBccW 8yugCiJLVj5zEMr/3fMM6rn+v0tGrGat4UoXP439ee1hs8ZAlLp3CnqtM11z5djgI+B1 DVTy+AVUOKKy3jF3xE9JVxH1JAkPw7Avzw1RffWXf/WBmsCVestzKrJRFB44cwjPZ38G G1eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682580259; x=1685172259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BYrl5h9ztwHlTXi7KX0jyzpTEG7xDFddx1GKX0YN0OY=; b=Ukc0wUa8DUlbIKpYhfDESbGYZ6SDCk1Eb82LcuTuE2+Ve+9ko9cI/6Q85NR95XTYKc EZulblGx8eyN1O9jAiSykhCmrCV/w2gz3GSnp/9hnoJ6Wlzs4NUyJcyAHx9F4YDNgDBS 5qN25z/fgnqwbizlO9jtw1X0/m1P7qCmvgmQ4ZHQQ7Szr3D1eOwbcMzWuh8Xvu1QUNwF nIdYTBGinrIJH9gIgtLDFW8aNWlZtCht6smLgoGowzVxWFqnhqVca6VklnnOOOOSh08k yzAOnFn3ImpWMM/LpyqW5wMEe7ucnaWeRkVsX6WxVOLwVclNd8ROhLVQWBXLTrEw8120 QJ6A== X-Gm-Message-State: AC+VfDxC8hZfbXxW1q8dMay/Zf7lUxO7KFtKK5Deh9z6UpvJH+DQgiXA 7jBJ6AK90ElJlLwTfHwsS4e73lICOTzBXb0jXNP/sQ== X-Google-Smtp-Source: ACHHUZ4wp1Ai89ytwAnBsc3S2ewOn9oOq4Zmq3ansVCH8eOLj+BoVaB4b6rcmu1kQvi91ubA7/uVcw== X-Received: by 2002:adf:f30e:0:b0:2f4:30ee:310b with SMTP id i14-20020adff30e000000b002f430ee310bmr469824wro.26.1682580259201; Thu, 27 Apr 2023 00:24:19 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id h3-20020a5d5043000000b002c70ce264bfsm17622420wrt.76.2023.04.27.00.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 00:24:18 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 27 Apr 2023 08:24:22 +0100 Message-Id: <20230427072422.695-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426131057.21550-13-naush@raspberrypi.com> References: <20230426131057.21550-13-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] pipeline: raspberrypi: Add stream flags to RPi::Stream 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: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a flags_ field to indicate stream state information in RPi::Stream. This replaces the existing external_ and importOnly_ boolean flags. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- .../pipeline/rpi/common/pipeline_base.cpp | 8 ++-- .../pipeline/rpi/common/rpi_stream.cpp | 40 ++++++++++-------- .../pipeline/rpi/common/rpi_stream.h | 42 ++++++++++++------- src/libcamera/pipeline/rpi/vc4/vc4.cpp | 8 ++-- 4 files changed, 60 insertions(+), 38 deletions(-) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 012766b38c32..94ba3422ff0c 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -31,6 +31,8 @@ using namespace RPi; LOG_DEFINE_CATEGORY(RPI) +using StreamFlag = RPi::Stream::StreamFlag; + namespace { constexpr unsigned int defaultRawBitDepth = 12; @@ -504,7 +506,7 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config) /* Start by freeing all buffers and reset the stream states. */ data->freeBuffers(); for (auto const stream : data->streams_) - stream->setExternal(false); + stream->clearFlags(StreamFlag::External); std::vector rawStreams, ispStreams; std::optional packing; @@ -752,7 +754,7 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request) /* Push all buffers supplied in the Request to the respective streams. */ for (auto stream : data->streams_) { - if (!stream->isExternal()) + if (!(stream->getFlags() & StreamFlag::External)) continue; FrameBuffer *buffer = request->findBuffer(stream); @@ -931,7 +933,7 @@ int PipelineHandlerBase::queueAllBuffers(Camera *camera) int ret; for (auto const stream : data->streams_) { - if (!stream->isExternal()) { + if (!(stream->getFlags() & StreamFlag::External)) { ret = stream->queueAllBuffers(); if (ret < 0) return ret; diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp index b7e4130f5e56..c158843cb0ed 100644 --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp @@ -14,6 +14,24 @@ LOG_DEFINE_CATEGORY(RPISTREAM) namespace RPi { +void Stream::setFlags(StreamFlags flags) +{ + flags_ |= flags; + + /* Import streams cannot be external. */ + ASSERT(!(flags_ & StreamFlag::External) || !(flags_ & StreamFlag::ImportOnly)); +} + +void Stream::clearFlags(StreamFlags flags) +{ + flags_ &= ~flags; +} + +RPi::Stream::StreamFlags Stream::getFlags() const +{ + return flags_; +} + V4L2VideoDevice *Stream::dev() const { return dev_.get(); @@ -32,18 +50,6 @@ void Stream::resetBuffers() availableBuffers_.push(buffer.get()); } -void Stream::setExternal(bool external) -{ - /* Import streams cannot be external. */ - ASSERT(!external || !importOnly_); - external_ = external; -} - -bool Stream::isExternal() const -{ - return external_; -} - void Stream::setExportedBuffers(std::vector> *buffers) { for (auto const &buffer : *buffers) @@ -57,7 +63,7 @@ const BufferMap &Stream::getBuffers() const unsigned int Stream::getBufferId(FrameBuffer *buffer) const { - if (importOnly_) + if (flags_ & StreamFlag::ImportOnly) return 0; /* Find the buffer in the map, and return the buffer id. */ @@ -88,7 +94,7 @@ int Stream::prepareBuffers(unsigned int count) { int ret; - if (!importOnly_) { + if (!(flags_ & StreamFlag::ImportOnly)) { if (count) { /* Export some frame buffers for internal use. */ ret = dev_->exportBuffers(count, &internalBuffers_); @@ -113,7 +119,7 @@ int Stream::prepareBuffers(unsigned int count) * \todo Find a better heuristic, or, even better, an exact solution to * this issue. */ - if (isExternal() || importOnly_) + if ((flags_ & StreamFlag::External) || (flags_ & StreamFlag::ImportOnly)) count = count * 2; return dev_->importBuffers(count); @@ -160,7 +166,7 @@ int Stream::queueBuffer(FrameBuffer *buffer) void Stream::returnBuffer(FrameBuffer *buffer) { - if (!external_) { + if (!(flags_ & StreamFlag::External)) { /* For internal buffers, simply requeue back to the device. */ queueToDevice(buffer); return; @@ -204,7 +210,7 @@ int Stream::queueAllBuffers() { int ret; - if (external_) + if (flags_ & StreamFlag::External) return 0; while (!availableBuffers_.empty()) { diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h index b8c74de35863..6edd304bdfe2 100644 --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h @@ -12,6 +12,7 @@ #include #include +#include #include #include "libcamera/internal/v4l2_videodevice.h" @@ -37,25 +38,41 @@ enum BufferMask { class Stream : public libcamera::Stream { public: + enum class StreamFlag { + None = 0, + /* + * Indicates that this stream only imports buffers, e.g. the ISP + * input stream. + */ + ImportOnly = (1 << 0), + /* + * Indicates that this stream is active externally, i.e. the + * buffers might be provided by (and returned to) the application. + */ + External = (1 << 1), + }; + + using StreamFlags = Flags; + Stream() - : id_(BufferMask::MaskID) + : flags_(StreamFlag::None), id_(BufferMask::MaskID) { } - Stream(const char *name, MediaEntity *dev, bool importOnly = false) - : external_(false), importOnly_(importOnly), name_(name), + Stream(const char *name, MediaEntity *dev, StreamFlags flags = StreamFlag::None) + : flags_(flags), name_(name), dev_(std::make_unique(dev)), id_(BufferMask::MaskID) { } + void setFlags(StreamFlags flags); + void clearFlags(StreamFlags flags); + StreamFlags getFlags() const; + V4L2VideoDevice *dev() const; const std::string &name() const; - bool isImporter() const; void resetBuffers(); - void setExternal(bool external); - bool isExternal() const; - void setExportedBuffers(std::vector> *buffers); const BufferMap &getBuffers() const; unsigned int getBufferId(FrameBuffer *buffer) const; @@ -112,14 +129,7 @@ private: void clearBuffers(); int queueToDevice(FrameBuffer *buffer); - /* - * Indicates that this stream is active externally, i.e. the buffers - * might be provided by (and returned to) the application. - */ - bool external_; - - /* Indicates that this stream only imports buffers, e.g. ISP input. */ - bool importOnly_; + StreamFlags flags_; /* Stream name identifier. */ std::string name_; @@ -182,4 +192,6 @@ public: } /* namespace RPi */ +LIBCAMERA_FLAGS_ENABLE_OPERATORS(RPi::Stream::StreamFlag) + } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp index a085a06376a8..7a3445865987 100644 --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp @@ -23,6 +23,8 @@ namespace libcamera { LOG_DECLARE_CATEGORY(RPI) +using StreamFlag = RPi::Stream::StreamFlag; + namespace { enum class Unicam : unsigned int { Image, Embedded }; @@ -320,7 +322,7 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr &camer } /* Tag the ISP input stream as an import stream. */ - data->isp_[Isp::Input] = RPi::Stream("ISP Input", ispOutput0, true); + data->isp_[Isp::Input] = RPi::Stream("ISP Input", ispOutput0, StreamFlag::ImportOnly); data->isp_[Isp::Output0] = RPi::Stream("ISP Output0", ispCapture1); data->isp_[Isp::Output1] = RPi::Stream("ISP Output1", ispCapture2); data->isp_[Isp::Stats] = RPi::Stream("ISP Stats", ispCapture3); @@ -502,7 +504,7 @@ int Vc4CameraData::platformConfigure(const V4L2SubdeviceFormat &sensorFormat, */ if (!rawStreams.empty()) { rawStreams[0].cfg->setStream(&unicam_[Unicam::Image]); - unicam_[Unicam::Image].setExternal(true); + unicam_[Unicam::Image].setFlags(StreamFlag::External); } ret = isp_[Isp::Input].dev()->setFormat(&unicamFormat); @@ -547,7 +549,7 @@ int Vc4CameraData::platformConfigure(const V4L2SubdeviceFormat &sensorFormat, << ColorSpace::toString(cfg->colorSpace); cfg->setStream(stream); - stream->setExternal(true); + stream->setFlags(StreamFlag::External); } ispOutputTotal_ = outStreams.size();