Patch Detail
Show a patch.
GET /api/1.1/patches/14186/?format=api
{ "id": 14186, "url": "https://patchwork.libcamera.org/api/1.1/patches/14186/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14186/", "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": "<20211019114802.665980-13-umang.jain@ideasonboard.com>", "date": "2021-10-19T11:48:02", "name": "[libcamera-devel,v2,12/12] android: camera_metadata: Rename get() to getMetadata()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e5052205cb3bd21a3be10ab24a5064225821702c", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/14186/mbox/", "series": [ { "id": 2638, "url": "https://patchwork.libcamera.org/api/1.1/series/2638/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2638", "date": "2021-10-19T11:47:50", "name": "android: Overhaul request handling", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2638/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14186/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14186/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 A3081C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 19 Oct 2021 11:48:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 61E6A68F59;\n\tTue, 19 Oct 2021 13:48:38 +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 8368268F55\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 Oct 2021 13:48:36 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.98])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7B1CA12A;\n\tTue, 19 Oct 2021 13:48: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=\"wlPat/J/\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634644116;\n\tbh=OKHlpiQ4ufljWLwJsdj0P40bJWU4e/CM8uUImxAy9f8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=wlPat/J/LJQtc6vIkXc0RxA9sr/+fZqNjzMWZPHFr6EFoC2+Ev3qyeoiCbKa1QQQ/\n\tqEmZRQXs/ga5+TMADNrwHA3dYt2kR+mj7xmdMlati3evXHgQJP6o69v5li3pTQb+97\n\tLyhTKepgv8n4okwQUX4Y5csMrPseX0Cvb4IEJZlI=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 19 Oct 2021 17:18:02 +0530", "Message-Id": "<20211019114802.665980-13-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20211019114802.665980-1-umang.jain@ideasonboard.com>", "References": "<20211019114802.665980-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 12/12] android: camera_metadata: Rename\n\tget() to getMetadata()", "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": "Rename CameraMetadata::get() to CameraMetadata::getMetadata()\nto avoid confusion with std::unique_ptr::get() when CameraMetadata\nis used with a std::unique_ptr.\n\nNo functional changes intended in this patch.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_device.cpp | 9 +++++----\n src/android/camera_metadata.cpp | 8 ++++----\n src/android/camera_metadata.h | 4 ++--\n 3 files changed, 11 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 0a2d3826..ea676409 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -440,7 +440,7 @@ void CameraDevice::setCallbacks(const camera3_callback_ops_t *callbacks)\n \n const camera_metadata_t *CameraDevice::getStaticMetadata()\n {\n-\treturn capabilities_.staticMetadata()->get();\n+\treturn capabilities_.staticMetadata()->getMetadata();\n }\n \n /*\n@@ -450,7 +450,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n {\n \tauto it = requestTemplates_.find(type);\n \tif (it != requestTemplates_.end())\n-\t\treturn it->second->get();\n+\t\treturn it->second->getMetadata();\n \n \t/* Use the capture intent matching the requested template type. */\n \tstd::unique_ptr<CameraMetadata> requestTemplate;\n@@ -496,7 +496,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\t\t\t captureIntent);\n \n \trequestTemplates_[type] = std::move(requestTemplate);\n-\treturn requestTemplates_[type]->get();\n+\treturn requestTemplates_[type]->getMetadata();\n }\n \n /*\n@@ -1171,7 +1171,8 @@ void CameraDevice::sendCaptureResults()\n \t\tcaptureResult.frame_number = descriptor->frameNumber_;\n \n \t\tif (descriptor->resultMetadata_)\n-\t\t\tcaptureResult.result = descriptor->resultMetadata_->get();\n+\t\t\tcaptureResult.result =\n+\t\t\t\tdescriptor->resultMetadata_->getMetadata();\n \n \t\tstd::vector<camera3_stream_buffer_t> resultBuffers;\n \t\tresultBuffers.reserve(descriptor->buffers_.size());\ndiff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\nindex 075b6a22..b3e515d2 100644\n--- a/src/android/camera_metadata.cpp\n+++ b/src/android/camera_metadata.cpp\n@@ -33,7 +33,7 @@ CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)\n }\n \n CameraMetadata::CameraMetadata(const CameraMetadata &other)\n-\t: CameraMetadata(other.get())\n+\t: CameraMetadata(other.getMetadata())\n {\n }\n \n@@ -51,7 +51,7 @@ CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)\n \tif (metadata_)\n \t\tfree_camera_metadata(metadata_);\n \n-\tmetadata_ = clone_camera_metadata(other.get());\n+\tmetadata_ = clone_camera_metadata(other.getMetadata());\n \tvalid_ = metadata_ != nullptr;\n \n \treturn *this;\n@@ -220,12 +220,12 @@ bool CameraMetadata::updateEntry(uint32_t tag, const void *data, size_t count,\n \treturn false;\n }\n \n-camera_metadata_t *CameraMetadata::get()\n+camera_metadata_t *CameraMetadata::getMetadata()\n {\n \treturn valid_ ? metadata_ : nullptr;\n }\n \n-const camera_metadata_t *CameraMetadata::get() const\n+const camera_metadata_t *CameraMetadata::getMetadata() const\n {\n \treturn valid_ ? metadata_ : nullptr;\n }\ndiff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\nindex 60be416c..8555c7c3 100644\n--- a/src/android/camera_metadata.h\n+++ b/src/android/camera_metadata.h\n@@ -85,8 +85,8 @@ public:\n \t\treturn updateEntry(tag, data, count, sizeof(T));\n \t}\n \n-\tcamera_metadata_t *get();\n-\tconst camera_metadata_t *get() const;\n+\tcamera_metadata_t *getMetadata();\n+\tconst camera_metadata_t *getMetadata() const;\n \n private:\n \tbool resize(size_t count, size_t size);\n", "prefixes": [ "libcamera-devel", "v2", "12/12" ] }