[{"id":10913,"web_url":"https://patchwork.libcamera.org/comment/10913/","msgid":"<20200627163856.GI5966@pendragon.ideasonboard.com>","date":"2020-06-27T16:38:56","subject":"Re: [libcamera-devel] [PATCH 11/13] libcamera: ipu3: Remove\n\tIPU3Stream","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Sat, Jun 27, 2020 at 05:00:41AM +0200, Niklas Söderlund wrote:\n> The pipeline specific subclass of the pipeline is empty, remove it.\n> \n> Signed-off-by: Niklas Söderlund \n\nAs mentioned in the review of 09/13, I'd be tempted to keep this class.\nThe patch itself is fine though, so if you want to remove it,\n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 32 ++++++++++++----------------\n> 1 file changed, 14 insertions(+), 18 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 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>","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 8E2D4C2E69\n\tfor ;\n\tSat, 27 Jun 2020 16:39:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 59F9E609DD;\n\tSat, 27 Jun 2020 18:39:03 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F254B609C2\n\tfor ;\n\tSat, 27 Jun 2020 18:38:58 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8B3AE576;\n\tSat, 27 Jun 2020 18:38:58 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"JiDUK/oE\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593275938;\n\tbh=Gp7KxjUS2Nfnl29dBEdd/1DaYopU7QdIcEueUMuXqvM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=JiDUK/oEZzba/h/w+WftmjhsRYxyTj1FOgB1IOL+JyuyLKIpv5h/to5Xx9PgN7lOT\n\t4mjaua3/tC6Quijz994N2ENHSw0dcTJtg9kYKF5PBUNLOoWuuhaNnHk5WMdu4Cz8Ja\n\tEAsK34pmjX16yR7V+S5Z90tQMHcv9QLyy/PB8KLs=","Date":"Sat, 27 Jun 2020 19:38:56 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200627163856.GI5966@pendragon.ideasonboard.com>","References":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>\n\t<20200627030043.2088585-12-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200627030043.2088585-12-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH 11/13] libcamera: ipu3: Remove\n\tIPU3Stream","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]