[{"id":15802,"web_url":"https://patchwork.libcamera.org/comment/15802/","msgid":"","date":"2021-03-22T21:14:53","subject":"Re: [libcamera-devel] [PATCH 3/7] pipeline: raspberrypi:\n\tConditionally open the embedded data node","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Wed, Mar 17, 2021 at 10:02:07AM +0000, Naushir Patuck wrote:\n> Conditionally open the embedded data node in pipeline_handler::match()\n> based on whether the ipa::init() result reports if the sensor supports\n> embedded data or not.\n> \n> Signed-off-by: Naushir Patuck \n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 60 ++++++++-----------\n> 1 file changed, 24 insertions(+), 36 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index ce1994186d66..cd8a10a5747f 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -138,7 +138,7 @@ class RPiCameraData : public CameraData\n> {\n> public:\n> \tRPiCameraData(PipelineHandler *pipe)\n> -\t\t: CameraData(pipe), embeddedNodeOpened_(false), state_(State::Stopped),\n> +\t\t: CameraData(pipe), state_(State::Stopped),\n> \t\t supportsFlips_(false), flipsAlterBayerOrder_(false),\n> \t\t updateScalerCrop_(true), dropFrameCount_(0), ispOutputCount_(0)\n> \t{\n> @@ -183,7 +183,6 @@ public:\n> \n> \tstd::unique_ptr delayedCtrls_;\n> \tbool sensorMetadata_;\n> -\tbool embeddedNodeOpened_;\n> \n> \t/*\n> \t * All the functions in this class are called from a single calling\n> @@ -749,19 +748,13 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> \t\tLOG(RPI, Error) << \"Failed to configure the IPA: \" << ret;\n> \n> \t/*\n> -\t * The IPA will set data->sensorMetadata_ to true if embedded data is\n> -\t * supported on this sensor. If so, open the Unicam embedded data\n> -\t * node and configure the output format.\n> +\t * Configure the Unicam embedded data output format only if the sensor\n> +\t * supports it.\n> \t */\n> \tif (data->sensorMetadata_) {\n> \t\tformat = {};\n> \t\tformat.fourcc = V4L2PixelFormat(V4L2_META_FMT_SENSOR_DATA);\n> \n> -\t\tif (!data->embeddedNodeOpened_) {\n> -\t\t\tdata->unicam_[Unicam::Embedded].dev()->open();\n> -\t\t\tdata->embeddedNodeOpened_ = true;\n> -\t\t}\n> -\n> \t\tLOG(RPI, Debug) << \"Setting embedded data format.\";\n> \t\tret = data->unicam_[Unicam::Embedded].dev()->setFormat(&format);\n> \t\tif (ret) {\n> @@ -778,14 +771,6 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> \t\t */\n> \t\tif (rawStream)\n> \t\t\tdata->unicam_[Unicam::Embedded].setExternal(true);\n> -\t} else {\n> -\t\t/*\n> -\t\t * No embedded data present, so we do not want to iterate over\n> -\t\t * the embedded data stream when starting and stopping.\n> -\t\t */\n> -\t\tdata->streams_.erase(std::remove(data->streams_.begin(), data->streams_.end(),\n> -\t\t\t\t\t\t &data->unicam_[Unicam::Embedded]),\n> -\t\t\t\t data->streams_.end());\n> \t}\n> \n> \t/*\n> @@ -989,24 +974,6 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n> \tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n> \tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n> \n> -\t/* This is just for convenience so that we can easily iterate over all streams. */\n> -\tfor (auto &stream : data->unicam_)\n> -\t\tdata->streams_.push_back(&stream);\n> -\tfor (auto &stream : data->isp_)\n> -\t\tdata->streams_.push_back(&stream);\n> -\n> -\t/*\n> -\t * Open all Unicam and ISP streams. The exception is the embedded data\n> -\t * stream, which only gets opened if the IPA reports that the sensor\n> -\t * supports embedded data. This happens in RPiCameraData::configureIPA().\n> -\t */\n> -\tfor (auto const stream : data->streams_) {\n> -\t\tif (stream != &data->unicam_[Unicam::Embedded]) {\n> -\t\t\tif (stream->dev()->open())\n> -\t\t\t\treturn false;\n> -\t\t}\n> -\t}\n> -\n> \t/* Wire up all the buffer connections. */\n> \tdata->unicam_[Unicam::Image].dev()->frameStart.connect(data.get(), &RPiCameraData::frameStarted);\n> \tdata->unicam_[Unicam::Image].dev()->bufferReady.connect(data.get(), &RPiCameraData::unicamBufferDequeue);\n> @@ -1036,6 +1003,27 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n> \t\treturn false;\n> \t}\n> \n> +\t/*\n> +\t * Open all Unicam and ISP streams. The exception is the embedded data\n> +\t * stream, which only gets opened if the IPA reports that the sensor\n> +\t * supports embedded data below.\n\ns/ below// ? Or maybe \"opened below\" ?\n\n> +\t *\n> +\t * The below grouping is just for convenience so that we can easily\n> +\t * iterate over all streams in one go.\n> +\t */\n> +\tfor (auto &stream : data->unicam_) {\n> +\t\tif (sensorConfig.sensorMetadata || &stream != &data->unicam_[Unicam::Embedded]) {\n> +\t\t\tdata->streams_.push_back(&stream);\n> +\t\t\tif (stream.dev()->open())\n> +\t\t\t\treturn false;\n> +\t\t}\n> +\t}\n\nGiven that there's only two streams, I'm tempted to write\n\n\tdata->streams_.push_back(&data->unicam_[Unicam::Image]);\n\tif (sensorConfig.sensorMetadata)\n\t\tdata->streams_.push_back(&data->unicam_[Unicam::Embedded]);\n\n\tfor (auto &stream : data->isp_)\n\t\tdata->streams_.push_back(&stream);\n\n\tfor (auto stream : data->streams_) {\n\t\tif (stream->dev()->open())\n\t\t\treturn false;\n\t}\n\nUp to you.\n\nReviewed-by: Laurent Pinchart \n\n> +\tfor (auto &stream : data->isp_) {\n> +\t\tdata->streams_.push_back(&stream);\n> +\t\tif (stream.dev()->open())\n> +\t\t\treturn false;\n> +\t}\n> +\n> \t/*\n> \t * Setup our delayed control writer with the sensor default\n> \t * gain and exposure delays. Mark VBLANK for priority write.","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 AE8F6BD80C\n\tfor ;\n\tMon, 22 Mar 2021 21:15:37 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 08E1468D65;\n\tMon, 22 Mar 2021 22:15:37 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C175168D50\n\tfor ;\n\tMon, 22 Mar 2021 22:15:35 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2CCE0ED;\n\tMon, 22 Mar 2021 22:15:35 +0100 (CET)"],"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=\"rs/Z+Tp7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616447735;\n\tbh=mErkTwEE9IcDiB3U3psDmoCBL49Y0haOl+5iti9z6jE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=rs/Z+Tp7edUdYdGYetV0262/tYE08kWyMnO6poVobG70CMEo0VAheHTwmA7EwW3kp\n\tQStMzDlQfqQT9x2yyy0DEXCWzYJbCaJ4P0bkBXUXQvgvBsJK0brLv9v0V7h6bNg+38\n\tGyJ+nNkM41v6Sok1YDpcYsYuwjLLkOQh+sxIhMsA=","Date":"Mon, 22 Mar 2021 23:14:53 +0200","From":"Laurent Pinchart ","To":"Naushir Patuck ","Message-ID":"","References":"<20210317100211.1067585-1-naush@raspberrypi.com>\n\t<20210317100211.1067585-4-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210317100211.1067585-4-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 3/7] pipeline: raspberrypi:\n\tConditionally open the embedded data node","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]