{"id":13223,"url":"https://patchwork.libcamera.org/api/1.1/patches/13223/?format=json","web_url":"https://patchwork.libcamera.org/patch/13223/","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-6-laurent.pinchart@ideasonboard.com>","date":"2021-08-05T17:58:42","name":"[libcamera-devel,v2,05/11] libcamera: pipeline: vimc: Migrate to Camera::Private","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"347e5f79f788348a293cb41da0c45e315f301326","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/13223/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/13223/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13223/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 B427AC3238\n\tfor ;\n\tThu, 5 Aug 2021 17:59:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 562C668855;\n\tThu, 5 Aug 2021 19:59:11 +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 A00DE68864\n\tfor ;\n\tThu, 5 Aug 2021 19:59:06 +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 4499FF95\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=\"oTgXwhbr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628186346;\n\tbh=4OPAlj3Xr7KTGXfsUgVFFWWlAJaI8Br09JaBulriIuU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=oTgXwhbrznEWuFr+/FXylMZnuhlskabBJHdH750geJR503glJ7Ut23pmt3yovrEty\n\twO0qXPeFWJm2VAnUYHwT4u0GdqDg67HTVd5kMxYsWpoLxiEUysOF1j67vCay7zAw4R\n\tbfBEuRWBKBu8ROKm4QWvhot+sXwFc6RVUOnPWYoY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 5 Aug 2021 20:58:42 +0300","Message-Id":"<20210805175848.24188-6-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 05/11] libcamera: pipeline: vimc:\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 \n---\n src/libcamera/pipeline/vimc/vimc.cpp | 19 +++++++++----------\n 1 file changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex d63562b1ee54..866c993d7e50 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -42,11 +42,11 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(VIMC)\n \n-class VimcCameraData : public CameraData\n+class VimcCameraData : public Camera::Private\n {\n public:\n \tVimcCameraData(PipelineHandler *pipe, MediaDevice *media)\n-\t\t: CameraData(pipe), media_(media)\n+\t\t: Camera::Private(pipe), media_(media)\n \t{\n \t}\n \n@@ -97,10 +97,9 @@ public:\n private:\n \tint processControls(VimcCameraData *data, Request *request);\n \n-\tVimcCameraData *cameraData(const Camera *camera)\n+\tVimcCameraData *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 \n@@ -438,10 +437,10 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \n \t/* Create and register the camera. */\n \tstd::set streams{ &data->stream_ };\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@@ -530,8 +529,8 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer)\n \trequest->metadata().set(controls::SensorTimestamp,\n \t\t\t\tbuffer->metadata().timestamp);\n \n-\tpipe_->completeBuffer(request, buffer);\n-\tpipe_->completeRequest(request);\n+\tpipe()->completeBuffer(request, buffer);\n+\tpipe()->completeRequest(request);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc)\n","prefixes":["libcamera-devel","v2","05/11"]}