From patchwork Tue Jul 20 10:13:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13051 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 4D99BC0109 for ; Tue, 20 Jul 2021 10:13:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 10FAF68536; Tue, 20 Jul 2021 12:13:25 +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="XYLtAY93"; 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 7DC8968545 for ; Tue, 20 Jul 2021 12:13:23 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0F40D51D; Tue, 20 Jul 2021 12:13:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626776003; bh=xj6Q2s9ieFwnt/fu+W8h11HgI+xs6p4AmUSCqNLCLcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYLtAY93XLW8o2B1ahgnozPMj3n+TJ+wDvRybZd9gEHvOYnACu+9Pw+1yMUVSmWAs cA5pD6eQU0VuElZkO1TzSjKfspEOv8r3e/Q9LvDXsoXxVjIKty4zL5/69mRalK4sJT I7rhjV+QgXsvYG/zZots53sdy7EnPFHjFjnlVc5Q= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 20 Jul 2021 19:13:00 +0900 Message-Id: <20210720101307.26010-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210720101307.26010-1-paul.elder@ideasonboard.com> References: <20210720101307.26010-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 2/9] android: metadata: Add hasEntry and entryContains 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" Add convenience functions for checking if an entry is present in a CameraMetadata instance, and to check if an array entry includes a specific value. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi --- Changes in v5: - refactor template code to reduce the footprint of specialized template code New in v4 --- src/android/camera_metadata.cpp | 18 ++++++++++++++++++ src/android/camera_metadata.h | 14 ++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 3fc7cf27..ac86c5fc 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -121,6 +121,24 @@ bool CameraMetadata::resize(size_t count, size_t size) return true; } +template<> +bool CameraMetadata::entryContainsOne(const camera_metadata_ro_entry_t &entry, + uint8_t value) const +{ + for (unsigned int i = 0; i < entry.count; i++) { + if (entry.data.u8[i] == value) + return true; + } + + return false; +} + +bool CameraMetadata::hasEntry(uint32_t tag) const +{ + camera_metadata_ro_entry_t entry; + return getEntry(tag, &entry); +} + bool CameraMetadata::addEntry(uint32_t tag, const void *data, size_t count, size_t elementSize) { diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h index 3b7c9e24..72ba4db2 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -29,6 +29,20 @@ public: bool isValid() const { return valid_; } bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const; + template + bool entryContainsOne(const camera_metadata_ro_entry_t &entry, T value) const; + + template bool entryContains(uint32_t tag, T value) const + { + camera_metadata_ro_entry_t entry; + if (!getEntry(tag, &entry)) + return false; + + return entryContainsOne(entry, value); + } + + bool hasEntry(uint32_t tag) const; + template> * = nullptr> bool addEntry(uint32_t tag, const T &data)