[{"id":18829,"web_url":"https://patchwork.libcamera.org/comment/18829/","msgid":"","date":"2021-08-16T12:06:53","subject":"Re: [libcamera-devel] [PATCH v3 05/14] libcamera: pipeline: simple:\n\tMigrate to Camera::Private","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 12/08/2021 00:26, Laurent Pinchart wrote:\n> As part of the effort to remove the CameraData class, migrate the\n> pipeline handler-specific camera data from CameraData to the\n> Camera::Private class.\n> \n> Signed-off-by: Laurent Pinchart \n> Reviewed-by: Jacopo Mondi \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/libcamera/pipeline/simple/simple.cpp | 25 ++++++++++++------------\n> 1 file changed, 13 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index ad581969fca1..947f3f1f8bd6 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -147,7 +147,7 @@ static const SimplePipelineInfo supportedDevices[] = {\n> \n> } /* namespace */\n> \n> -class SimpleCameraData : public CameraData\n> +class SimpleCameraData : public Camera::Private\n> {\n> public:\n> \tSimpleCameraData(SimplePipelineHandler *pipe,\n> @@ -213,7 +213,7 @@ private:\n> \t * reference to the camera data, store a new reference to the camera.\n> \t */\n> \tstd::shared_ptr camera_;\n> -\tconst SimpleCameraData *data_;\n> +\tSimpleCameraData *data_;\n> \n> \tconst SimpleCameraData::Configuration *pipeConfig_;\n> \tbool needConversion_;\n> @@ -246,10 +246,9 @@ protected:\n> private:\n> \tstatic constexpr unsigned int kNumInternalBuffers = 3;\n> \n> -\tSimpleCameraData *cameraData(const Camera *camera)\n> +\tSimpleCameraData *cameraData(Camera *camera)\n> \t{\n> -\t\treturn static_cast(\n> -\t\t\tPipelineHandler::cameraData(camera));\n> +\t\treturn static_cast(camera->_d());\n> \t}\n> \n> \tstd::vector locateSensors();\n> @@ -274,7 +273,7 @@ private:\n> SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> \t\t\t\t unsigned int numStreams,\n> \t\t\t\t MediaEntity *sensor)\n> -\t: CameraData(pipe), streams_(numStreams)\n> +\t: Camera::Private(pipe), streams_(numStreams)\n> {\n> \tint ret;\n> \n> @@ -355,7 +354,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> \n> int SimpleCameraData::init()\n> {\n> -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> +\tSimplePipelineHandler *pipe =\n> +\t\tstatic_cast(this->pipe());\n> \tSimpleConverter *converter = pipe->converter();\n> \tint ret;\n> \n> @@ -480,7 +480,8 @@ int SimpleCameraData::setupLinks()\n> int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n> \t\t\t\t V4L2Subdevice::Whence whence)\n> {\n> -\tSimplePipelineHandler *pipe = static_cast(pipe_);\n> +\tSimplePipelineHandler *pipe =\n> +\t\tstatic_cast(this->pipe());\n> \tint ret;\n> \n> \t/*\n> @@ -581,7 +582,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n> \t}\n> \n> \t/* Adjust the requested streams. */\n> -\tSimplePipelineHandler *pipe = static_cast(data_->pipe_);\n> +\tSimplePipelineHandler *pipe = static_cast(data_->pipe());\n> \tSimpleConverter *converter = pipe->converter();\n> \n> \t/*\n> @@ -1046,10 +1047,10 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\t\t std::inserter(streams, streams.end()),\n> \t\t\t [](Stream &stream) { return &stream; });\n> \n> +\t\tconst std::string &id = data->sensor_->id();\n> \t\tstd::shared_ptr camera =\n> -\t\t\tCamera::create(std::make_unique(this),\n> -\t\t\t\t data->sensor_->id(), streams);\n> -\t\tregisterCamera(std::move(camera), std::move(data));\n> +\t\t\tCamera::create(std::move(data), id, streams);\n> +\t\tregisterCamera(std::move(camera), nullptr);\n> \t\tregistered = true;\n> \t}\n> \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 09F1ABD87C\n\tfor ;\n\tMon, 16 Aug 2021 12:06:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7887F68893;\n\tMon, 16 Aug 2021 14:06:57 +0200 (CEST)","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 19D196025D\n\tfor ;\n\tMon, 16 Aug 2021 14:06:56 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7D6BC3E5;\n\tMon, 16 Aug 2021 14:06:55 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ZnhZcPK7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629115615;\n\tbh=0Aji+UhcqC6c7Vb6x3TcELwYVeddt9ES61tj1fkW7ZI=;\n\th=To:References:From:Subject:Date:In-Reply-To:From;\n\tb=ZnhZcPK7usTqphiAr8oILmdpZ+YlakjyQsxFQtWOB+gWHy+O4mqD7Ujvb5aaY2Ahp\n\t69Ec3hhxeGft8NUY54+tRlruOlhaC684xoXeIoESmYPkzhsis9TVErSetGEuRTXmIv\n\tl7J9+9lY2uyf1WWYpl33LfyAy0tPEN0joIi50hSo=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>\n\t<20210811232625.17280-6-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Message-ID":"","Date":"Mon, 16 Aug 2021 13:06:53 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210811232625.17280-6-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v3 05/14] libcamera: pipeline: simple:\n\tMigrate to Camera::Private","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]