From patchwork Tue Aug 4 11:31:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9179 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 54C14BD86F for ; Tue, 4 Aug 2020 11:31:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 97B696053B; Tue, 4 Aug 2020 13:31:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YbwW2lT7"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E9BD7603C9 for ; Tue, 4 Aug 2020 13:31:14 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7C6C1543; Tue, 4 Aug 2020 13:31:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1596540674; bh=FSRl82mnazAxyXw8toJs8i+PKdD7KRKQtgHivukWGWY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbwW2lT7RHozbtFeqw3C/pdoR3rHmXZulh7QsRMovK1RXCBpDOM2FJUbOOErsSig8 pHY6P3FGDFEPIrvZzWvL462o+gha44eKe1IQCLX5GvBl+hyTP64U06YIJ07xMrzPMa 3E7l+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 storage usage X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Track the quantity and size of metadata tags as they are added, to facilitate reporting of the consumed space. Signed-off-by: Kieran Bingham --- src/android/camera_metadata.cpp | 17 ++++++++++++++++- src/android/camera_metadata.h | 12 ++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 47b2e4ef117a..4acb802026c7 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -14,6 +14,8 @@ using namespace libcamera; LOG_DEFINE_CATEGORY(CameraMetadata); CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity) + : entryCapacity_(entryCapacity), dataCapacity_(dataCapacity), + entries_(0), size_(0) { metadata_ = allocate_camera_metadata(entryCapacity, dataCapacity); valid_ = metadata_ != nullptr; @@ -30,8 +32,11 @@ bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count) if (!valid_) return false; - if (!add_camera_metadata_entry(metadata_, tag, data, count)) + if (!add_camera_metadata_entry(metadata_, tag, data, count)) { + entries_++; + size_ += count; return true; + } const char *name = get_camera_metadata_tag_name(tag); if (name) @@ -50,3 +55,13 @@ camera_metadata_t *CameraMetadata::get() { return valid_ ? metadata_ : nullptr; } + +std::string CameraMetadata::usage() const +{ + std::ostringstream os; + + os << "Entries: " << entries_ << "/" << entryCapacity_ + << " Size: " << size_ << "/" << dataCapacity_; + + return os.str(); +} diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 75a9d7066f31..8612eb57974d 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -8,6 +8,7 @@ #define __ANDROID_CAMERA_METADATA_H__ #include +#include #include @@ -22,9 +23,20 @@ public: camera_metadata_t *get(); + size_t entries() const { return entries_; } + size_t size() const { return size_; }; + + std::string usage() const; + private: camera_metadata_t *metadata_; bool valid_; + + size_t entryCapacity_; + size_t dataCapacity_; + + size_t entries_; + size_t size_; }; #endif /* __ANDROID_CAMERA_METADATA_H__ */