{"id":10914,"url":"https://patchwork.libcamera.org/api/patches/10914/?format=json","web_url":"https://patchwork.libcamera.org/patch/10914/","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":"<20210121101549.134574-3-paul.elder@ideasonboard.com>","date":"2021-01-21T10:15:42","name":"[libcamera-devel,v2,2/9] android: CameraMetadata: Add copy constructor and getEntry","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1d3c86682f6f0a283985e582ab189a4345a7f78f","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10914/mbox/","series":[{"id":1590,"url":"https://patchwork.libcamera.org/api/series/1590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1590","date":"2021-01-21T10:15:40","name":"Fill in android result metadata and EXIF tags","version":2,"mbox":"https://patchwork.libcamera.org/series/1590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10914/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10914/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 D6CD4C0F2A\n\tfor ;\n\tThu, 21 Jan 2021 10:16:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1D01681D9;\n\tThu, 21 Jan 2021 11:16:06 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A1C14681BF\n\tfor ;\n\tThu, 21 Jan 2021 11:16:05 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2F3E98AE;\n\tThu, 21 Jan 2021 11:16:03 +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=\"MDxesJ56\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611224165;\n\tbh=xSfX1fkIg5O+/ViRLQ/Kg1CST+vVOjtbFrsOuoTHvVU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MDxesJ56zvXFV2cNE1N3BQlf0/v1ZvpTrF4L7BMiUD4gDKoT5oBc5OYhmYkXmc1WF\n\tq2FZjk6YH5mGOzbhCEbs2tpmmITKfDJS2ZdR7Fe7hb1tAPzccuF9wvdYdnuoYGtikr\n\ty8UKagCDBF71cFAP0lQVguZWxRWi0NQgGOMY31AQ=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 21 Jan 2021 19:15:42 +0900","Message-Id":"<20210121101549.134574-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/9] 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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a copy constructor and assigment 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\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- getEntry returns bool instead of int\n---\n src/android/camera_metadata.cpp | 34 +++++++++++++++++++++++++++++++++\n src/android/camera_metadata.h | 5 +++++\n 2 files changed, 39 insertions(+)","diff":"diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\nindex edea48fe..3b98d25c 100644\n--- a/src/android/camera_metadata.cpp\n+++ b/src/android/camera_metadata.cpp\n@@ -19,12 +19,46 @@ 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+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 9d047b1b..720b760d 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","v2","2/9"]}