{"id":13318,"url":"https://patchwork.libcamera.org/api/patches/13318/?format=json","web_url":"https://patchwork.libcamera.org/patch/13318/","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":"<20210811232625.17280-11-laurent.pinchart@ideasonboard.com>","date":"2021-08-11T23:26:21","name":"[libcamera-devel,v3,10/14] libcamera: pipeline: ipu3: Migrate to Camera::Private","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"70c0ad7909b8ae2c56c20d0a5dd5dd62baea6000","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13318/mbox/","series":[{"id":2341,"url":"https://patchwork.libcamera.org/api/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/13318/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13318/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 55422C3246\n\tfor ;\n\tWed, 11 Aug 2021 23:26:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F18BD68918;\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 4369768886\n\tfor ;\n\tThu, 12 Aug 2021 01:26:36 +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 E0D6F268\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=\"PfWfWoMT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628724396;\n\tbh=rXSaRM0K1auWBt1ooiii8P2SStVn+jVh5lFOQeep07g=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=PfWfWoMTUJDxfRp621ZtkDiJSgoLIrg4RRDaHFcnK1Kpvx+0sXQFTR+6JVMmhNPry\n\tEyjwY/xhyO5wFjedi8OsTPpG1rv9X6NWZFrPLZWpqP0sJjYBb7chkzpgduJESJXI6A\n\toC336f3zkggCzSb3KUaX7gHAvshmErKYzpwbkPe4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 12 Aug 2021 02:26:21 +0300","Message-Id":"<20210811232625.17280-11-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 10/14] libcamera: pipeline: ipu3:\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/ipu3/ipu3.cpp | 38 +++++++++++++---------------\n 1 file changed, 18 insertions(+), 20 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex b9c0941c5ea8..4d07592e0c7e 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -53,11 +53,11 @@ static const ControlInfoMap::Map IPU3Controls = {\n \t{ &controls::draft::PipelineDepth, ControlInfo(2, 3) },\n };\n \n-class IPU3CameraData : public CameraData\n+class IPU3CameraData : public Camera::Private\n {\n public:\n \tIPU3CameraData(PipelineHandler *pipe)\n-\t\t: CameraData(pipe), exposureTime_(0), supportsFlips_(false)\n+\t\t: Camera::Private(pipe), exposureTime_(0), supportsFlips_(false)\n \t{\n \t}\n \n@@ -146,10 +146,9 @@ public:\n \tbool match(DeviceEnumerator *enumerator) override;\n \n private:\n-\tIPU3CameraData *cameraData(const Camera *camera)\n+\tIPU3CameraData *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 \tint initControls(IPU3CameraData *data);\n@@ -814,10 +813,10 @@ void IPU3CameraData::cancelPendingRequests()\n \t\tfor (auto it : request->buffers()) {\n \t\t\tFrameBuffer *buffer = it.second;\n \t\t\tbuffer->cancel();\n-\t\t\tpipe_->completeBuffer(request, buffer);\n+\t\t\tpipe()->completeBuffer(request, buffer);\n \t\t}\n \n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n \t\tpendingRequests_.pop();\n \t}\n }\n@@ -1198,12 +1197,11 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t\t\t\t&IPU3CameraData::statBufferReady);\n \n \t\t/* Create and register the Camera instance. */\n-\t\tstd::string cameraId = cio2->sensor()->id();\n+\t\tconst std::string &cameraId = cio2->sensor()->id();\n \t\tstd::shared_ptr camera =\n-\t\t\tCamera::create(std::make_unique(this),\n-\t\t\t\t cameraId, streams);\n+\t\t\tCamera::create(std::move(data), cameraId, streams);\n \n-\t\tregisterCamera(std::move(camera), std::move(data));\n+\t\tregisterCamera(std::move(camera), nullptr);\n \n \t\tLOG(IPU3, Info)\n \t\t\t<< \"Registered Camera[\" << numCameras << \"] \\\"\"\n@@ -1218,7 +1216,7 @@ int PipelineHandlerIPU3::registerCameras()\n \n int IPU3CameraData::loadIPA()\n {\n-\tipa_ = IPAManager::createIPA(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA(pipe(), 1, 1);\n \tif (!ipa_)\n \t\treturn -ENOENT;\n \n@@ -1275,7 +1273,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,\n \n \t\tinfo->metadataProcessed = true;\n \t\tif (frameInfos_.tryComplete(info))\n-\t\t\tpipe_->completeRequest(request);\n+\t\t\tpipe()->completeRequest(request);\n \n \t\tbreak;\n \t}\n@@ -1303,7 +1301,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \n \tRequest *request = info->request;\n \n-\tpipe_->completeBuffer(request, buffer);\n+\tpipe()->completeBuffer(request, buffer);\n \n \trequest->metadata().set(controls::draft::PipelineDepth, 3);\n \t/* \\todo Move the ExposureTime control to the IPA. */\n@@ -1314,7 +1312,7 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \trequest->metadata().set(controls::ScalerCrop, cropRegion_);\n \n \tif (frameInfos_.tryComplete(info))\n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n }\n \n /**\n@@ -1346,16 +1344,16 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \t\tfor (auto it : request->buffers()) {\n \t\t\tFrameBuffer *b = it.second;\n \t\t\tb->cancel();\n-\t\t\tpipe_->completeBuffer(request, b);\n+\t\t\tpipe()->completeBuffer(request, b);\n \t\t}\n \n \t\tframeInfos_.remove(info);\n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n \t\treturn;\n \t}\n \n \tif (request->findBuffer(&rawStream_))\n-\t\tpipe_->completeBuffer(request, buffer);\n+\t\tpipe()->completeBuffer(request, buffer);\n \n \tipa::ipu3::IPU3Event ev;\n \tev.op = ipa::ipu3::EventFillParams;\n@@ -1381,7 +1379,7 @@ void IPU3CameraData::paramBufferReady(FrameBuffer *buffer)\n \tRequest *request = info->request;\n \n \tif (frameInfos_.tryComplete(info))\n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n }\n \n void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n@@ -1400,7 +1398,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \t\t * In that event, we must have obtained the Request before hand.\n \t\t */\n \t\tif (frameInfos_.tryComplete(info))\n-\t\t\tpipe_->completeRequest(request);\n+\t\t\tpipe()->completeRequest(request);\n \n \t\treturn;\n \t}\n","prefixes":["libcamera-devel","v3","10/14"]}