{"id":13225,"url":"https://patchwork.libcamera.org/api/1.1/patches/13225/?format=json","web_url":"https://patchwork.libcamera.org/patch/13225/","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":"<20210805175848.24188-8-laurent.pinchart@ideasonboard.com>","date":"2021-08-05T17:58:44","name":"[libcamera-devel,v2,07/11] libcamera: pipeline: raspberrypi: Migrate to Camera::Private","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2c448d81402f3665f126e3855f4daab103b91587","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/13225/mbox/","series":[{"id":2312,"url":"https://patchwork.libcamera.org/api/1.1/series/2312/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2312","date":"2021-08-05T17:58:37","name":"libcamera: Replace CameraData with Camera::Private","version":2,"mbox":"https://patchwork.libcamera.org/series/2312/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13225/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13225/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 C4562C3237\n\tfor ;\n\tThu, 5 Aug 2021 17:59:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6C07F68888;\n\tThu, 5 Aug 2021 19:59:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4B0456880D\n\tfor ;\n\tThu, 5 Aug 2021 19:59:07 +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 E92DEE1A\n\tfor ;\n\tThu, 5 Aug 2021 19:59:06 +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=\"S3McCcNB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628186347;\n\tbh=8uvisiKXLOsv76nbNLuQKtRbbTJnL3+c/hQciaGux5M=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=S3McCcNBd/2zM8VD2stEutlli5fDPlJLl0hW6AV6Lf/29LIiNqy4CaGEHD35JNUai\n\tgI+QkqDvVNdbcglKRZNC+cUQUH/h23A+98AL1ZmTJet56YGZFOnHxziU+qJn4eRcuT\n\tC4QzJJarKBEAQ/WHb4bCb6Osms0PT/sTmMnkeVls=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Aug 2021 20:58:44 +0300","Message-Id":"<20210805175848.24188-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>","References":"<20210805175848.24188-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 07/11] libcamera: pipeline:\n\traspberrypi: Migrate 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 \n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 24 +++++++++----------\n 1 file changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 33cd5765b52e..754db5a65f4a 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -135,11 +135,11 @@ enum class Isp : unsigned int { Input, Output0, Output1, Stats };\n \n } /* namespace */\n \n-class RPiCameraData : public CameraData\n+class RPiCameraData : public Camera::Private\n {\n public:\n \tRPiCameraData(PipelineHandler *pipe)\n-\t\t: CameraData(pipe), state_(State::Stopped),\n+\t\t: Camera::Private(pipe), state_(State::Stopped),\n \t\t supportsFlips_(false), flipsAlterBayerOrder_(false),\n \t\t dropFrameCount_(0), ispOutputCount_(0)\n \t{\n@@ -263,9 +263,9 @@ public:\n \tbool match(DeviceEnumerator *enumerator) override;\n \n private:\n-\tRPiCameraData *cameraData(const Camera *camera)\n+\tRPiCameraData *cameraData(Camera *camera)\n \t{\n-\t\treturn static_cast(PipelineHandler::cameraData(camera));\n+\t\treturn static_cast(camera->_d());\n \t}\n \n \tint queueAllBuffers(Camera *camera);\n@@ -1106,10 +1106,10 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \tstreams.insert(&data->isp_[Isp::Output1]);\n \n \t/* Create and register the camera. */\n+\tconst std::string &id = data->sensor_->id();\n \tstd::shared_ptr camera =\n-\t\tCamera::create(new Camera::Private(this), data->sensor_->id(),\n-\t\t\t streams);\n-\tregisterCamera(std::move(camera), std::move(data));\n+\t\tCamera::create(data.release(), id, streams);\n+\tregisterCamera(std::move(camera), nullptr);\n \n \treturn true;\n }\n@@ -1224,7 +1224,7 @@ void RPiCameraData::frameStarted(uint32_t sequence)\n \n int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)\n {\n-\tipa_ = IPAManager::createIPA(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA(pipe(), 1, 1);\n \n \tif (!ipa_)\n \t\treturn -ENOENT;\n@@ -1528,11 +1528,11 @@ void RPiCameraData::clearIncompleteRequests()\n \t\t\t */\n \t\t\tif (buffer->request()) {\n \t\t\t\tbuffer->cancel();\n-\t\t\t\tpipe_->completeBuffer(request, buffer);\n+\t\t\t\tpipe()->completeBuffer(request, buffer);\n \t\t\t}\n \t\t}\n \n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n \t\trequestQueue_.pop_front();\n \t}\n }\n@@ -1556,7 +1556,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n \t\t\t * Tag the buffer as completed, returning it to the\n \t\t\t * application.\n \t\t\t */\n-\t\t\tpipe_->completeBuffer(request, buffer);\n+\t\t\tpipe()->completeBuffer(request, buffer);\n \t\t} else {\n \t\t\t/*\n \t\t\t * This buffer was not part of the Request, or there is no\n@@ -1619,7 +1619,7 @@ void RPiCameraData::checkRequestCompleted()\n \t\tif (state_ != State::IpaComplete)\n \t\t\treturn;\n \n-\t\tpipe_->completeRequest(request);\n+\t\tpipe()->completeRequest(request);\n \t\trequestQueue_.pop_front();\n \t\trequestCompleted = true;\n \t}\n","prefixes":["libcamera-devel","v2","07/11"]}