{"id":8453,"url":"https://patchwork.libcamera.org/api/patches/8453/?format=json","web_url":"https://patchwork.libcamera.org/patch/8453/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200627030043.2088585-12-niklas.soderlund@ragnatech.se>","date":"2020-06-27T03:00:41","name":"[libcamera-devel,11/13] libcamera: ipu3: Remove IPU3Stream","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"17f2fa272b1124c307c93cb36748c48ec36f8e4c","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8453/mbox/","series":[{"id":1046,"url":"https://patchwork.libcamera.org/api/series/1046/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1046","date":"2020-06-27T03:00:30","name":"libcamera: ipu3: Refactoring of ImgU","version":1,"mbox":"https://patchwork.libcamera.org/series/1046/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8453/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8453/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 39974C2E66\n\tfor ;\n\tSat, 27 Jun 2020 03:01:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 13F9760AFF;\n\tSat, 27 Jun 2020 05:01:03 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DA467609A5\n\tfor ;\n\tSat, 27 Jun 2020 05:00:57 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 588fc2f9-b822-11ea-86ee-0050569116f7;\n\tSat, 27 Jun 2020 05:00:24 +0200 (CEST)"],"X-Halon-ID":"588fc2f9-b822-11ea-86ee-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 27 Jun 2020 05:00:41 +0200","Message-Id":"<20200627030043.2088585-12-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>","References":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The pipeline specific subclass of the pipeline is empty, remove it.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 32 ++++++++++++----------------\n 1 file changed, 14 insertions(+), 18 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex b72b631cdc051aab..0ebd762982142471 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -31,10 +31,6 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPU3)\n \n-class IPU3Stream : public Stream\n-{\n-};\n-\n class IPU3CameraData : public CameraData\n {\n public:\n@@ -49,9 +45,9 @@ public:\n \tCIO2Device cio2_;\n \tImgUDevice *imgu_;\n \n-\tIPU3Stream outStream_;\n-\tIPU3Stream vfStream_;\n-\tIPU3Stream rawStream_;\n+\tStream outStream_;\n+\tStream vfStream_;\n+\tStream rawStream_;\n };\n \n class IPU3CameraConfiguration : public CameraConfiguration\n@@ -62,7 +58,7 @@ public:\n \tStatus validate() override;\n \n \tconst StreamConfiguration &cio2Format() const { return cio2Configuration_; };\n-\tconst std::vector &streams() { return streams_; }\n+\tconst std::vector &streams() { return streams_; }\n \n private:\n \tstatic constexpr unsigned int IPU3_BUFFER_COUNT = 4;\n@@ -80,7 +76,7 @@ private:\n \tconst IPU3CameraData *data_;\n \n \tStreamConfiguration cio2Configuration_;\n-\tstd::vector streams_;\n+\tstd::vector streams_;\n };\n \n class PipelineHandlerIPU3 : public PipelineHandler\n@@ -144,7 +140,7 @@ void IPU3CameraConfiguration::assignStreams()\n \t * resolution is equal to the sensor resolution, and the viewfinder\n \t * stream otherwise.\n \t */\n-\tstd::set availableStreams = {\n+\tstd::set availableStreams = {\n \t\t&data_->outStream_,\n \t\t&data_->vfStream_,\n \t\t&data_->rawStream_,\n@@ -162,7 +158,7 @@ void IPU3CameraConfiguration::assignStreams()\n \tfor (const StreamConfiguration &cfg : config_) {\n \t\tconst PixelFormatInfo &info =\n \t\t\tPixelFormatInfo::info(cfg.pixelFormat);\n-\t\tconst IPU3Stream *stream;\n+\t\tconst Stream *stream;\n \n \t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n \t\t\tstream = &data_->rawStream_;\n@@ -265,7 +261,7 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()\n \tfor (unsigned int i = 0; i < config_.size(); ++i) {\n \t\tStreamConfiguration &cfg = config_[i];\n \t\tconst StreamConfiguration oldCfg = cfg;\n-\t\tconst IPU3Stream *stream = streams_[i];\n+\t\tconst Stream *stream = streams_[i];\n \n \t\tif (stream == &data_->rawStream_) {\n \t\t\tcfg = cio2Configuration_;\n@@ -297,7 +293,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tIPU3CameraConfiguration *config;\n-\tstd::set streams = {\n+\tstd::set streams = {\n \t\t&data->outStream_,\n \t\t&data->vfStream_,\n \t\t&data->rawStream_,\n@@ -307,7 +303,7 @@ CameraConfiguration *PipelineHandlerIPU3::generateConfiguration(Camera *camera,\n \n \tfor (const StreamRole role : roles) {\n \t\tStreamConfiguration cfg = {};\n-\t\tIPU3Stream *stream = nullptr;\n+\t\tStream *stream = nullptr;\n \n \t\tcfg.pixelFormat = formats::NV12;\n \n@@ -415,8 +411,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \tIPU3CameraConfiguration *config =\n \t\tstatic_cast(c);\n \tIPU3CameraData *data = cameraData(camera);\n-\tIPU3Stream *outStream = &data->outStream_;\n-\tIPU3Stream *vfStream = &data->vfStream_;\n+\tStream *outStream = &data->outStream_;\n+\tStream *vfStream = &data->vfStream_;\n \tCIO2Device *cio2 = &data->cio2_;\n \tImgUDevice *imgu = data->imgu_;\n \tV4L2DeviceFormat outputFormat;\n@@ -489,7 +485,7 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\t * unwanted modifications of camera data in the configuration\n \t\t * validate() implementation.\n \t\t */\n-\t\tIPU3Stream *stream = const_cast(config->streams()[i]);\n+\t\tStream *stream = const_cast(config->streams()[i]);\n \t\tStreamConfiguration &cfg = (*config)[i];\n \n \t\tcfg.setStream(stream);\n@@ -679,7 +675,7 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n \n \t/* Queue all buffers from the request aimed for the ImgU. */\n \tfor (auto it : request->buffers()) {\n-\t\tIPU3Stream *stream = static_cast(it.first);\n+\t\tStream *stream = static_cast(it.first);\n \t\tFrameBuffer *buffer = it.second;\n \t\tint ret;\n \n","prefixes":["libcamera-devel","11/13"]}