| Message ID | 20210730103536.81117-3-paul.elder@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Paul, Thank you for the patch. On Fri, Jul 30, 2021 at 07:35:29PM +0900, Paul Elder wrote: > 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 <paul.elder@ideasonboard.com> > Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes in v6: > - restore to v4 > > Changes in v5: > - refactor template code to reduce the footprint of specialized template > code > > New in v4 > --- > src/android/camera_metadata.cpp | 20 ++++++++++++++++++++ > src/android/camera_metadata.h | 4 ++++ > 2 files changed, 24 insertions(+) > > diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp > index 3fc7cf27..075b6a22 100644 > --- a/src/android/camera_metadata.cpp > +++ b/src/android/camera_metadata.cpp > @@ -121,6 +121,26 @@ bool CameraMetadata::resize(size_t count, size_t size) > return true; > } > > +template<> bool CameraMetadata::entryContains(uint32_t tag, uint8_t value) const > +{ > + camera_metadata_ro_entry_t entry; > + if (!getEntry(tag, &entry)) > + return false; > + > + 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..03b3e701 100644 > --- a/src/android/camera_metadata.h > +++ b/src/android/camera_metadata.h > @@ -29,6 +29,10 @@ public: > bool isValid() const { return valid_; } > bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const; > > + template<typename T> bool entryContains(uint32_t tag, T value) const; > + > + bool hasEntry(uint32_t tag) const; > + > template<typename T, > std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> > bool addEntry(uint32_t tag, const T &data)
diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 3fc7cf27..075b6a22 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -121,6 +121,26 @@ bool CameraMetadata::resize(size_t count, size_t size) return true; } +template<> bool CameraMetadata::entryContains(uint32_t tag, uint8_t value) const +{ + camera_metadata_ro_entry_t entry; + if (!getEntry(tag, &entry)) + return false; + + 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..03b3e701 100644 --- a/src/android/camera_metadata.h +++ b/src/android/camera_metadata.h @@ -29,6 +29,10 @@ public: bool isValid() const { return valid_; } bool getEntry(uint32_t tag, camera_metadata_ro_entry_t *entry) const; + template<typename T> bool entryContains(uint32_t tag, T value) const; + + bool hasEntry(uint32_t tag) const; + template<typename T, std::enable_if_t<std::is_arithmetic_v<T>> * = nullptr> bool addEntry(uint32_t tag, const T &data)