Patch Detail
Show a patch.
GET /api/1.1/patches/13313/?format=api
{ "id": 13313, "url": "https://patchwork.libcamera.org/api/1.1/patches/13313/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13313/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "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-6-laurent.pinchart@ideasonboard.com>", "date": "2021-08-11T23:26:16", "name": "[libcamera-devel,v3,05/14] libcamera: pipeline: simple: Migrate to Camera::Private", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6c525bc7e8a4268426ae1c206ae3b633acc001d3", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13313/mbox/", "series": [ { "id": 2341, "url": "https://patchwork.libcamera.org/api/1.1/series/2341/?format=api", "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/13313/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13313/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 E1679C3242\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 11 Aug 2021 23:26:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 538D06888F;\n\tThu, 12 Aug 2021 01:26:43 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 915F8687F0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 12 Aug 2021 01:26:34 +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 468A3EE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 12 Aug 2021 01:26:34 +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=\"m2P0JSsa\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628724394;\n\tbh=aPSQ/QEScBaGvkF9RWNIl+V6njvJDzUPiTILR1VFIsA=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=m2P0JSsaJ1WAziwu3ps5cXgaPKW86lMLx8tqASgd7VoIbDpOaN/BNjRUMtznSkY/6\n\tlF+oUatXePRFwbjMFEN+0yNNosFkAmWZ/0mMRV6wPFqrKRXhLu+FNC4QdyW/KqveFU\n\t3ZbNSnBIX/1pgFU3f4PZ1Mh7o0sJ0Lzm6sgbyM38=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 12 Aug 2021 02:26:16 +0300", "Message-Id": "<20210811232625.17280-6-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-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 05/14] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\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 ad581969fca1..947f3f1f8bd6 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> 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<SimpleCameraData *>(\n-\t\t\tPipelineHandler::cameraData(camera));\n+\t\treturn static_cast<SimpleCameraData *>(camera->_d());\n \t}\n \n \tstd::vector<MediaEntity *> 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<SimplePipelineHandler *>(pipe_);\n+\tSimplePipelineHandler *pipe =\n+\t\tstatic_cast<SimplePipelineHandler *>(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<SimplePipelineHandler *>(pipe_);\n+\tSimplePipelineHandler *pipe =\n+\t\tstatic_cast<SimplePipelineHandler *>(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<SimplePipelineHandler *>(data_->pipe_);\n+\tSimplePipelineHandler *pipe = static_cast<SimplePipelineHandler *>(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> camera =\n-\t\t\tCamera::create(std::make_unique<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(std::move(data), id, streams);\n+\t\tregisterCamera(std::move(camera), nullptr);\n \t\tregistered = true;\n \t}\n \n", "prefixes": [ "libcamera-devel", "v3", "05/14" ] }