{"id":9179,"url":"https://patchwork.libcamera.org/api/1.1/patches/9179/?format=json","web_url":"https://patchwork.libcamera.org/patch/9179/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200804113107.127257-2-kieran.bingham@ideasonboard.com>","date":"2020-08-04T11:31:06","name":"[libcamera-devel,1/2] android: camera_metadata: Track storage usage","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"bc66ffb0995edb0ef0a425f44adec495739f102a","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/1.1/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/9179/mbox/","series":[{"id":1188,"url":"https://patchwork.libcamera.org/api/1.1/series/1188/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1188","date":"2020-08-04T11:31:05","name":"android: metadata usage tracking","version":1,"mbox":"https://patchwork.libcamera.org/series/1188/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9179/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9179/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 54C14BD86F\n\tfor ;\n\tTue, 4 Aug 2020 11:31:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 97B696053B;\n\tTue, 4 Aug 2020 13:31:16 +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 E9BD7603C9\n\tfor ;\n\tTue, 4 Aug 2020 13:31:14 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7C6C1543;\n\tTue, 4 Aug 2020 13:31:14 +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=\"YbwW2lT7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596540674;\n\tbh=FSRl82mnazAxyXw8toJs8i+PKdD7KRKQtgHivukWGWY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=YbwW2lT7RHozbtFeqw3C/pdoR3rHmXZulh7QsRMovK1RXCBpDOM2FJUbOOErsSig8\n\tpHY6P3FGDFEPIrvZzWvL462o+gha44eKe1IQCLX5GvBl+hyTP64U06YIJ07xMrzPMa\n\t3E7l+U15W+gSZrtLcJ5yMiiij57Xo91HON8W1a1w=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Tue, 4 Aug 2020 12:31:06 +0100","Message-Id":"<20200804113107.127257-2-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200804113107.127257-1-kieran.bingham@ideasonboard.com>","References":"<20200804113107.127257-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/2] android: camera_metadata: Track\n\tstorage usage","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":"Track the quantity and size of metadata tags as they are added, to\nfacilitate reporting of the consumed space.\n\nSigned-off-by: Kieran Bingham \n---\n src/android/camera_metadata.cpp | 17 ++++++++++++++++-\n src/android/camera_metadata.h | 12 ++++++++++++\n 2 files changed, 28 insertions(+), 1 deletion(-)","diff":"diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp\nindex 47b2e4ef117a..4acb802026c7 100644\n--- a/src/android/camera_metadata.cpp\n+++ b/src/android/camera_metadata.cpp\n@@ -14,6 +14,8 @@ using namespace libcamera;\n LOG_DEFINE_CATEGORY(CameraMetadata);\n \n CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity)\n+\t: entryCapacity_(entryCapacity), dataCapacity_(dataCapacity),\n+\t entries_(0), size_(0)\n {\n \tmetadata_ = allocate_camera_metadata(entryCapacity, dataCapacity);\n \tvalid_ = metadata_ != nullptr;\n@@ -30,8 +32,11 @@ bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count)\n \tif (!valid_)\n \t\treturn false;\n \n-\tif (!add_camera_metadata_entry(metadata_, tag, data, count))\n+\tif (!add_camera_metadata_entry(metadata_, tag, data, count)) {\n+\t\tentries_++;\n+\t\tsize_ += count;\n \t\treturn true;\n+\t}\n \n \tconst char *name = get_camera_metadata_tag_name(tag);\n \tif (name)\n@@ -50,3 +55,13 @@ camera_metadata_t *CameraMetadata::get()\n {\n \treturn valid_ ? metadata_ : nullptr;\n }\n+\n+std::string CameraMetadata::usage() const\n+{\n+\tstd::ostringstream os;\n+\n+\tos << \"Entries: \" << entries_ << \"/\" << entryCapacity_\n+\t << \" Size: \" << size_ << \"/\" << dataCapacity_;\n+\n+\treturn os.str();\n+}\ndiff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h\nindex 75a9d7066f31..8612eb57974d 100644\n--- a/src/android/camera_metadata.h\n+++ b/src/android/camera_metadata.h\n@@ -8,6 +8,7 @@\n #define __ANDROID_CAMERA_METADATA_H__\n \n #include \n+#include \n \n #include \n \n@@ -22,9 +23,20 @@ public:\n \n \tcamera_metadata_t *get();\n \n+\tsize_t entries() const { return entries_; }\n+\tsize_t size() const { return size_; };\n+\n+\tstd::string usage() const;\n+\n private:\n \tcamera_metadata_t *metadata_;\n \tbool valid_;\n+\n+\tsize_t entryCapacity_;\n+\tsize_t dataCapacity_;\n+\n+\tsize_t entries_;\n+\tsize_t size_;\n };\n \n #endif /* __ANDROID_CAMERA_METADATA_H__ */\n","prefixes":["libcamera-devel","1/2"]}