{"id":13221,"url":"https://patchwork.libcamera.org/api/patches/13221/?format=json","web_url":"https://patchwork.libcamera.org/patch/13221/","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":"<20210805175848.24188-4-laurent.pinchart@ideasonboard.com>","date":"2021-08-05T17:58:40","name":"[libcamera-devel,v2,03/11] libcamera: pipeline: simple: Migrate to Camera::Private","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9110892f35b2042c02580d5db6cf23a7d2d4bf28","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/13221/mbox/","series":[{"id":2312,"url":"https://patchwork.libcamera.org/api/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/13221/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13221/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 E73E7C3237\n\tfor ;\n\tThu, 5 Aug 2021 17:59:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23BD268823;\n\tThu, 5 Aug 2021 19:59:08 +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 F3A70687CF\n\tfor ;\n\tThu, 5 Aug 2021 19:59:05 +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 9A030F95\n\tfor ;\n\tThu, 5 Aug 2021 19:59:05 +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=\"GEY6ASrk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628186345;\n\tbh=+aXGq3GFx8h1Hd35k/8Hn5d7WNmsQ53jjBd5VUsrVsE=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=GEY6ASrkZ//uBiLbcCvA6r4oOr6Gdm5ZxUefALyKLS46pDrpa5DwmjnoliuC9cHYR\n\tenG0lH5DwdkIDs739iJkiQUyZ1U4T8JdtX686e6qP+gKR659n1AvqRissI7RXU8OkT\n\tFolohwj48BpKUi2AT/HILevoob835HRYGgIW0MmE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Aug 2021 20:58:40 +0300","Message-Id":"<20210805175848.24188-4-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-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 03/11] 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\" "},"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 \n---\n src/libcamera/pipeline/simple/simple.cpp | 25 ++++++++++++------------\n 1 file changed, 13 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 43af3fafa475..81d342a3fa73 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(new Camera::Private(this),\n-\t\t\t\t data->sensor_->id(), streams);\n-\t\tregisterCamera(std::move(camera), std::move(data));\n+\t\t\tCamera::create(data.release(), id, streams);\n+\t\tregisterCamera(std::move(camera), nullptr);\n \t\tregistered = true;\n \t}\n \n","prefixes":["libcamera-devel","v2","03/11"]}