{"id":13316,"url":"https://patchwork.libcamera.org/api/1.1/patches/13316/?format=json","web_url":"https://patchwork.libcamera.org/patch/13316/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210811232625.17280-9-laurent.pinchart@ideasonboard.com>","date":"2021-08-11T23:26:19","name":"[libcamera-devel,v3,08/14] libcamera: pipeline: rkisp1: Migrate to Camera::Private","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"72ecf7c616eb5e36bda6735d7be82dc7ba9d6ff9","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13316/mbox/","series":[{"id":2341,"url":"https://patchwork.libcamera.org/api/1.1/series/2341/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2341","date":"2021-08-11T23:26:11","name":"libcamera: Replace CameraData with Camera::Private","version":3,"mbox":"https://patchwork.libcamera.org/series/2341/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13316/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13316/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 7CFC1C3244\n\tfor ;\n\tWed, 11 Aug 2021 23:26:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 38475688A6;\n\tThu, 12 Aug 2021 01:26:44 +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 9CCB868890\n\tfor ;\n\tThu, 12 Aug 2021 01:26:35 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4516D268\n\tfor ;\n\tThu, 12 Aug 2021 01:26:35 +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=\"aLtuWOsB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628724395;\n\tbh=307YZt/lZTG6ihHfLQ0N1Cg+F7UDUwwqFFelOtW8FIM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=aLtuWOsBetnzN0gnJErcYriUVOXiffQUr4Q9f/qOeI7RG8fGbFQgZE/3Gn6GCqd1B\n\t+3m7BhxjsivxWLYAXQypevxENL5GshFLYBbIML+f51wiIXpyFdgBNkkP9h+zQz/ant\n\tPEqXq6qPNQbvp20WDz1pxCmWUV+BmKybWx0bvJ2M=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 12 Aug 2021 02:26:19 +0300","Message-Id":"<20210811232625.17280-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>","References":"<20210811232625.17280-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 08/14] libcamera: pipeline: rkisp1:\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\" "},"content":"As part of the effort to remove the CameraData class, migrate the\npipeline handler-specific camera data from CameraData to the\nCamera::Private class.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 28 ++++++++++++------------\n 1 file changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex cebd94b2c18b..bcaec77eca26 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -77,12 +77,12 @@ private:\n \tstd::map frameInfo_;\n };\n \n-class RkISP1CameraData : public CameraData\n+class RkISP1CameraData : public Camera::Private\n {\n public:\n \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n \t\t\t RkISP1SelfPath *selfPath)\n-\t\t: CameraData(pipe), frame_(0), frameInfo_(pipe),\n+\t\t: Camera::Private(pipe), frame_(0), frameInfo_(pipe),\n \t\t mainPath_(mainPath), selfPath_(selfPath)\n \t{\n \t}\n@@ -152,16 +152,15 @@ public:\n \tbool match(DeviceEnumerator *enumerator) override;\n \n private:\n-\tRkISP1CameraData *cameraData(const Camera *camera)\n+\tRkISP1CameraData *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 \tfriend RkISP1CameraData;\n \tfriend RkISP1Frames;\n \n-\tint initLinks(const Camera *camera, const CameraSensor *sensor,\n+\tint initLinks(Camera *camera, const CameraSensor *sensor,\n \t\t const RkISP1CameraConfiguration &config);\n \tint createCamera(MediaEntity *sensor);\n \tvoid tryCompleteRequest(Request *request);\n@@ -307,7 +306,7 @@ RkISP1FrameInfo *RkISP1Frames::find(Request *request)\n \n int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n {\n-\tipa_ = IPAManager::createIPA(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA(pipe(), 1, 1);\n \tif (!ipa_)\n \t\treturn -ENOENT;\n \n@@ -333,7 +332,8 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n \t\tbreak;\n \t}\n \tcase ipa::rkisp1::ActionParamFilled: {\n-\t\tPipelineHandlerRkISP1 *pipe = static_cast(pipe_);\n+\t\tPipelineHandlerRkISP1 *pipe =\n+\t\t\tstatic_cast(this->pipe());\n \t\tRkISP1FrameInfo *info = frameInfo_.find(frame);\n \t\tif (!info)\n \t\t\tbreak;\n@@ -361,7 +361,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,\n void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata)\n {\n \tPipelineHandlerRkISP1 *pipe =\n-\t\tstatic_cast(pipe_);\n+\t\tstatic_cast(this->pipe());\n \n \tRkISP1FrameInfo *info = frameInfo_.find(frame);\n \tif (!info)\n@@ -847,7 +847,7 @@ void PipelineHandlerRkISP1::stop(Camera *camera)\n \t\tLOG(RkISP1, Warning)\n \t\t\t<< \"Failed to stop parameters for \" << camera->id();\n \n-\tASSERT(camera->_d()->queuedRequests_.empty());\n+\tASSERT(data->queuedRequests_.empty());\n \tdata->frameInfo_.clear();\n \n \tfreeBuffers(camera);\n@@ -879,7 +879,7 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n * Match and Setup\n */\n \n-int PipelineHandlerRkISP1::initLinks(const Camera *camera,\n+int PipelineHandlerRkISP1::initLinks(Camera *camera,\n \t\t\t\t const CameraSensor *sensor,\n \t\t\t\t const RkISP1CameraConfiguration &config)\n {\n@@ -970,10 +970,10 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \t\t&data->mainPathStream_,\n \t\t&data->selfPathStream_,\n \t};\n+\tconst std::string &id = data->sensor_->id();\n \tstd::shared_ptr camera =\n-\t\tCamera::create(std::make_unique(this),\n-\t\t\t data->sensor_->id(), streams);\n-\tregisterCamera(std::move(camera), std::move(data));\n+\t\tCamera::create(std::move(data), id, streams);\n+\tregisterCamera(std::move(camera), nullptr);\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","v3","08/14"]}