From patchwork Sun Jun 28 00:15:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 8467 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 33687C2E6A for ; Sun, 28 Jun 2020 00:15:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E4BCC60AF7; Sun, 28 Jun 2020 02:15:57 +0200 (CEST) Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4238E60AF6 for ; Sun, 28 Jun 2020 02:15:54 +0200 (CEST) X-Halon-ID: 731e49d7-b8d4-11ea-86ee-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id 731e49d7-b8d4-11ea-86ee-0050569116f7; Sun, 28 Jun 2020 02:15:19 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sun, 28 Jun 2020 02:15:30 +0200 Message-Id: <20200628001532.2685967-12-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628001532.2685967-1-niklas.soderlund@ragnatech.se> References: <20200628001532.2685967-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 11/13] libcamera: ipu3: Remove IPU3Stream 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" The pipeline specific subclass of the pipeline is empty, remove it. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/ipu3/ipu3.cpp | 32 ++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 332cbbded52497f7..4e997c529153662c 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -31,10 +31,6 @@ namespace libcamera { LOG_DEFINE_CATEGORY(IPU3) -class IPU3Stream : public Stream -{ -}; - class IPU3CameraData : public CameraData { public: @@ -49,9 +45,9 @@ public: CIO2Device cio2_; ImgUDevice *imgu_; - IPU3Stream outStream_; - IPU3Stream vfStream_; - IPU3Stream rawStream_; + Stream outStream_; + Stream vfStream_; + Stream rawStream_; }; class IPU3CameraConfiguration : public CameraConfiguration @@ -62,7 +58,7 @@ public: Status validate() override; const StreamConfiguration &cio2Format() const { return cio2Configuration_; }; - const std::vector &streams() { return streams_; } + const std::vector &streams() { return streams_; } private: static constexpr unsigned int IPU3_BUFFER_COUNT = 4; @@ -80,7 +76,7 @@ private: const IPU3CameraData *data_; StreamConfiguration cio2Configuration_; - std::vector streams_; + std::vector streams_; }; class PipelineHandlerIPU3 : public PipelineHandler @@ -144,7 +140,7 @@ void IPU3CameraConfiguration::assignStreams() * resolution is equal to the sensor resolution, and the viewfinder * stream otherwise. */ - std::set availableStreams = { + std::set availableStreams = { &data_->outStream_, &data_->vfStream_, &data_->rawStream_, @@ -162,7 +158,7 @@ void IPU3CameraConfiguration::assignStreams() for (const StreamConfiguration &cfg : config_) { const PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat); - const IPU3Stream *stream; + const Stream *stream; if (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW) stream = &data_->rawStream_; @@ -265,7 +261,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate() for (unsigned int i = 0; i < config_.size(); ++i) { StreamConfiguration &cfg = config_[i]; const StreamConfiguration oldCfg = cfg; - const IPU3Stream *stream = streams_[i]; + const Stream *stream = streams_[i]; if (stream == &data_->rawStream_) { cfg = cio2Configuration_; @@ -297,7 +293,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera, { IPU3CameraData *data = cameraData(camera); IPU3CameraConfiguration *config; - std::set streams = { + std::set streams = { &data->outStream_, &data->vfStream_, &data->rawStream_, @@ -307,7 +303,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera, for (const StreamRole role : roles) { StreamConfiguration cfg = {}; - IPU3Stream *stream = nullptr; + Stream *stream = nullptr; cfg.pixelFormat = formats::NV12; @@ -415,8 +411,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) IPU3CameraConfiguration *config = static_cast(c); IPU3CameraData *data = cameraData(camera); - IPU3Stream *outStream = &data->outStream_; - IPU3Stream *vfStream = &data->vfStream_; + Stream *outStream = &data->outStream_; + Stream *vfStream = &data->vfStream_; CIO2Device *cio2 = &data->cio2_; ImgUDevice *imgu = data->imgu_; V4L2DeviceFormat outputFormat; @@ -489,7 +485,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c) * unwanted modifications of camera data in the configuration * validate() implementation. */ - IPU3Stream *stream = const_cast(config->streams()[i]); + Stream *stream = const_cast(config->streams()[i]); StreamConfiguration &cfg = (*config)[i]; cfg.setStream(stream); @@ -679,7 +675,7 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request) /* Queue all buffers from the request aimed for the ImgU. */ for (auto it : request->buffers()) { - IPU3Stream *stream = static_cast(it.first); + Stream *stream = static_cast(it.first); FrameBuffer *buffer = it.second; if (stream == &data->rawStream_)