{"id":10929,"url":"https://patchwork.libcamera.org/api/patches/10929/?format=json","web_url":"https://patchwork.libcamera.org/patch/10929/","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":"<20210121165305.367801-2-jacopo@jmondi.org>","date":"2021-01-21T16:52:59","name":"[libcamera-devel,1/7] android: camera_metadata: Add copy constructor and getEntry","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7234341304f2020177ab5282560e5fbfb06ade52","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10929/mbox/","series":[{"id":1593,"url":"https://patchwork.libcamera.org/api/series/1593/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1593","date":"2021-01-21T16:52:58","name":"android: camera device and metadata improvements","version":1,"mbox":"https://patchwork.libcamera.org/series/1593/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10929/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10929/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 E05EABD808\n\tfor ;\n\tThu, 21 Jan 2021 16:52:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 42FA06820B;\n\tThu, 21 Jan 2021 17:52:57 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6880768201\n\tfor ;\n\tThu, 21 Jan 2021 17:52:56 +0100 (CET)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 0B15A1C0003;\n\tThu, 21 Jan 2021 16:52:55 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org,\n\tPaul Elder ","Date":"Thu, 21 Jan 2021 17:52:59 +0100","Message-Id":"<20210121165305.367801-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20210121165305.367801-1-jacopo@jmondi.org>","References":"<20210121165305.367801-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/7] android: camera_metadata: Add copy\n\tconstructor and getEntry","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Paul Elder \n\nAdd a copy constructor and assignment operator to CameraMetadata, as well\na constructor from camera_metadata_t. Also add a function getEntry to\nallow getting metadata entries from CameraMetadata. This allows us to\nuse CameraMetadata for reading from camera_metadata_t.\n\nReviewed-by: Jacopo Mondi \nSigned-off-by: Paul Elder \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_metadata.cpp | 33 +++++++++++++++++++++++++++++++++\n src/android/camera_metadata.h | 5 +++++\n 2 files changed, 38 insertions(+)","diff":"diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\nindex edea48fe5581..8e36e758d231 100644\n--- a/src/android/camera_metadata.cpp\n+++ b/src/android/camera_metadata.cpp\n@@ -19,12 +19,45 @@ CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity)\n \tvalid_ = metadata_ != nullptr;\n }\n \n+CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)\n+{\n+\tmetadata_ = clone_camera_metadata(metadata);\n+\tvalid_ = metadata_ != nullptr;\n+}\n+\n+CameraMetadata::CameraMetadata(const CameraMetadata &other)\n+\t: CameraMetadata(other.get())\n+{\n+}\n+\n CameraMetadata::~CameraMetadata()\n {\n \tif (metadata_)\n \t\tfree_camera_metadata(metadata_);\n }\n \n+CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)\n+{\n+\tif (this == &other)\n+\t\treturn *this;\n+\n+\tif (metadata_)\n+\t\tfree_camera_metadata(metadata_);\n+\n+\tmetadata_ = clone_camera_metadata(other.get());\n+\tvalid_ = metadata_ != nullptr;\n+\n+\treturn *this;\n+}\n+\n+bool CameraMetadata::getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const\n+{\n+\tif (find_camera_metadata_ro_entry(metadata_, tag, entry))\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count)\n {\n \tif (!valid_)\ndiff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\nindex 9d047b1bb534..720b760d44da 100644\n--- a/src/android/camera_metadata.h\n+++ b/src/android/camera_metadata.h\n@@ -15,9 +15,14 @@ class CameraMetadata\n {\n public:\n \tCameraMetadata(size_t entryCapacity, size_t dataCapacity);\n+\tCameraMetadata(const camera_metadata_t *metadata);\n+\tCameraMetadata(const CameraMetadata &other);\n \t~CameraMetadata();\n \n+\tCameraMetadata &operator=(const CameraMetadata &other);\n+\n \tbool isValid() const { return valid_; }\n+\tbool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const;\n \tbool addEntry(uint32_t tag, const void *data, size_t data_count);\n \tbool updateEntry(uint32_t tag, const void *data, size_t data_count);\n \n","prefixes":["libcamera-devel","1/7"]}