[{"id":14554,"web_url":"https://patchwork.libcamera.org/comment/14554/","msgid":"","date":"2021-01-15T17:06:36","subject":"Re: [libcamera-devel] [PATCH 2/6] android: CameraMetadata: Add copy\n\tconstructor and getEntry","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, Jan 14, 2021 at 07:40:31PM +0900, Paul Elder wrote:\n> Add a copy constructor to CameraMetadata, as well as a constructor from\n\nYou also need a copy assignement operator then. See\nhttps://en.wikipedia.org/wiki/Rule_of_three_(C%2B%2B_programming).\n\n> camera_metadata_t. Also add a function getEntry to allow getting\n> metadata entries from CameraMetadata. This allows us to use\n> CameraMetadata for reading form camera_metadata_t.\n\ns/form/from/\n\n> Signed-off-by: Paul Elder \n> ---\n> src/android/camera_metadata.cpp | 23 +++++++++++++++++++++++\n> src/android/camera_metadata.h | 3 +++\n> 2 files changed, 26 insertions(+)\n> \n> diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\n> index edea48fe..57ac6009 100644\n> --- a/src/android/camera_metadata.cpp\n> +++ b/src/android/camera_metadata.cpp\n> @@ -19,12 +19,35 @@ 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> +{\n> +\tmetadata_ = clone_camera_metadata(other.get());\n> +\tvalid_ = metadata_ != nullptr;\n> +}\n> +\n> CameraMetadata::~CameraMetadata()\n> {\n> \tif (metadata_)\n> \t\tfree_camera_metadata(metadata_);\n> }\n> \n> +int CameraMetadata::getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const\n\nShould this return a bool like addEntry() and updateEntry() ?\n\n> +{\n> +\tif (!entry)\n> +\t\treturn -EINVAL;\n\nI'd drop this, it shouldn't happen.\n\n> +\n> +\tif (find_camera_metadata_ro_entry(metadata_, tag, entry))\n> +\t\treturn -EINVAL;\n> +\n> +\treturn 0;\n> +}\n> +\n> bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count)\n> {\n> \tif (!valid_)\n> diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\n> index 9d047b1b..fa1c4983 100644\n> --- a/src/android/camera_metadata.h\n> +++ b/src/android/camera_metadata.h\n> @@ -15,9 +15,12 @@ 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> \tbool isValid() const { return valid_; }\n> +\tint 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>","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 2DE40BD808\n\tfor ;\n\tFri, 15 Jan 2021 17:06:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B0D17680F9;\n\tFri, 15 Jan 2021 18:06:55 +0100 (CET)","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 3C9C3680EF\n\tfor ;\n\tFri, 15 Jan 2021 18:06:54 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A2C2B527;\n\tFri, 15 Jan 2021 18:06:53 +0100 (CET)"],"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=\"aKQUp5G2\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1610730413;\n\tbh=fA/Espn9Z1gqYSi1v+k2MaLOgv6mPPemzgGbrvPgt9M=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=aKQUp5G2afn5NiD8IolDZKv3UcfzaPnZxLy/0fWph8O951SMI4Fm0lzMAKSqNDgsK\n\tSsFgkW1GN+5C4o5Em2yFO2O58OkLpu8k37u7n7MDFI0qusrp8rzccZLJrAU4UiUgKM\n\tmj1QtnSlMbtZcJxEOYjQsDx2WU0R4rAyUFJ9/7v0=","Date":"Fri, 15 Jan 2021 19:06:36 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210114104035.302968-1-paul.elder@ideasonboard.com>\n\t<20210114104035.302968-3-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210114104035.302968-3-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/6] android: CameraMetadata: 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]