Pictures: Move to exiv2 for image metadata retrieval (exif and iptc)

CMakeLists.txt

@@ -210,6 +210,7 @@ set(required_deps ASS>=0.15.0
  Cdio
  CrossGUID
  Curl
+ Exiv2
  FFMPEG
  FlatBuffers
  Fmt

tools/depends/target/Makefile

@@ -9,6 +9,7 @@ DEPENDS = \
  brotli \
  bzip2 \
  dav1d \
+ exiv2 \
  expat \
  ffmpeg \
  fontconfig \

xbmc/addons/ImageDecoder.cpp

@@ -113,63 +113,63 @@ bool CImageDecoder::LoadInfoTag(const std::string& fileName, CPictureInfoTag* ta
  * @todo Rework @ref CPictureInfoTag to not limit on fixed structures ExifInfo & IPTCInfo.
  */
 
- tag->m_exifInfo.Width = ifcTag.width;
- tag->m_exifInfo.Height = ifcTag.height;
- tag->m_exifInfo.Distance = ifcTag.distance;
- tag->m_exifInfo.Orientation = ifcTag.orientation;
- tag->m_exifInfo.IsColor = ifcTag.color == ADDON_IMG_COLOR_COLORED ? 1 : 0;
- tag->m_exifInfo.ApertureFNumber = ifcTag.aperture_f_number;
- tag->m_exifInfo.FlashUsed = ifcTag.flash_used ? 1 : 0;
- tag->m_exifInfo.LightSource = ifcTag.light_source;
- tag->m_exifInfo.FocalLength = ifcTag.focal_length;
- tag->m_exifInfo.FocalLength35mmEquiv = ifcTag.focal_length_in_35mm_format;
- tag->m_exifInfo.MeteringMode = ifcTag.metering_mode;
- tag->m_exifInfo.DigitalZoomRatio = ifcTag.digital_zoom_ratio;
- tag->m_exifInfo.ExposureTime = ifcTag.exposure_time;
- tag->m_exifInfo.ExposureBias = ifcTag.exposure_bias;
- tag->m_exifInfo.ExposureProgram = ifcTag.exposure_program;
- tag->m_exifInfo.ExposureMode = ifcTag.exposure_mode;
- tag->m_exifInfo.ISOequivalent = static_cast<int>(ifcTag.iso_speed);
+ tag->m_imageMetadata.exifInfo.Width = ifcTag.width;
+ tag->m_imageMetadata.exifInfo.Height = ifcTag.height;
+ tag->m_imageMetadata.exifInfo.Distance = ifcTag.distance;
+ tag->m_imageMetadata.exifInfo.Orientation = ifcTag.orientation;
+ tag->m_imageMetadata.exifInfo.IsColor = ifcTag.color == ADDON_IMG_COLOR_COLORED ? 1 : 0;
+ tag->m_imageMetadata.exifInfo.ApertureFNumber = ifcTag.aperture_f_number;
+ tag->m_imageMetadata.exifInfo.FlashUsed = ifcTag.flash_used ? 1 : 0;
+ tag->m_imageMetadata.exifInfo.LightSource = ifcTag.light_source;
+ tag->m_imageMetadata.exifInfo.FocalLength = ifcTag.focal_length;
+ tag->m_imageMetadata.exifInfo.FocalLength35mmEquiv = ifcTag.focal_length_in_35mm_format;
+ tag->m_imageMetadata.exifInfo.MeteringMode = ifcTag.metering_mode;
+ tag->m_imageMetadata.exifInfo.DigitalZoomRatio = ifcTag.digital_zoom_ratio;
+ tag->m_imageMetadata.exifInfo.ExposureTime = ifcTag.exposure_time;
+ tag->m_imageMetadata.exifInfo.ExposureBias = ifcTag.exposure_bias;
+ tag->m_imageMetadata.exifInfo.ExposureProgram = ifcTag.exposure_program;
+ tag->m_imageMetadata.exifInfo.ExposureMode = ifcTag.exposure_mode;
+ tag->m_imageMetadata.exifInfo.ISOequivalent = static_cast<int>(ifcTag.iso_speed);
  CDateTime dt;
  dt.SetFromUTCDateTime(ifcTag.time_created);
- tag->m_iptcInfo.TimeCreated = dt.GetAsLocalizedDateTime();
  tag->m_dateTimeTaken = dt;
- tag->m_exifInfo.GpsInfoPresent = ifcTag.gps_info_present;
- if (tag->m_exifInfo.GpsInfoPresent)
+ tag->m_imageMetadata.iptcInfo.TimeCreated = dt.GetAsLocalizedDateTime();
+ tag->m_imageMetadata.exifInfo.GpsInfoPresent = ifcTag.gps_info_present;
+ if (tag->m_imageMetadata.exifInfo.GpsInfoPresent)
  {
- tag->m_exifInfo.GpsLat =
+ tag->m_imageMetadata.exifInfo.GpsLat =
  StringUtils::Format("{}{:.0f}°{:.0f}'{:.2f}\"", ifcTag.latitude_ref, ifcTag.latitude[0],
  ifcTag.latitude[1], ifcTag.latitude[2]);
- tag->m_exifInfo.GpsLong =
+ tag->m_imageMetadata.exifInfo.GpsLong =
  StringUtils::Format("{}{:.0f}°{:.0f}'{:.2f}\"", ifcTag.longitude_ref, ifcTag.longitude[0],
  ifcTag.longitude[1], ifcTag.longitude[2]);
- tag->m_exifInfo.GpsAlt =
+ tag->m_imageMetadata.exifInfo.GpsAlt =
  StringUtils::Format("{}{:.2f} m", ifcTag.altitude_ref ? '-' : '+', ifcTag.altitude);
  }
 
  if (ifcTag.camera_manufacturer)
  {
- tag->m_exifInfo.CameraMake = ifcTag.camera_manufacturer;
+ tag->m_imageMetadata.exifInfo.CameraMake = ifcTag.camera_manufacturer;
  free(ifcTag.camera_manufacturer);
  }
  if (ifcTag.camera_model)
  {
- tag->m_exifInfo.CameraModel = ifcTag.camera_model;
+ tag->m_imageMetadata.exifInfo.CameraModel = ifcTag.camera_model;
  free(ifcTag.camera_model);
  }
  if (ifcTag.author)
  {
- tag->m_iptcInfo.Author = ifcTag.author;
+ tag->m_imageMetadata.iptcInfo.Author = ifcTag.author;
  free(ifcTag.author);
  }
  if (ifcTag.description)
  {
- tag->m_exifInfo.Description = ifcTag.description;
+ tag->m_imageMetadata.exifInfo.Description = ifcTag.description;
  free(ifcTag.description);
  }
  if (ifcTag.copyright)
  {
- tag->m_iptcInfo.CopyrightNotice = ifcTag.copyright;
+ tag->m_imageMetadata.iptcInfo.CopyrightNotice = ifcTag.copyright;
  free(ifcTag.copyright);
  }
  }

xbmc/pictures/CMakeLists.txt

@@ -1,11 +1,8 @@
-set(SOURCES ExifParse.cpp
- GUIDialogPictureInfo.cpp
+set(SOURCES GUIDialogPictureInfo.cpp
  GUIViewStatePictures.cpp
  GUIWindowPictures.cpp
  GUIWindowSlideShow.cpp
- IptcParse.cpp
- JpegParse.cpp
- libexif.cpp
+ ImageMetadataParser.cpp
  Picture.cpp
  PictureFolderImageFileLoader.cpp
  PictureInfoLoader.cpp
@@ -16,10 +13,14 @@ set(SOURCES ExifParse.cpp
  SlideShowPicture.cpp)
 
 set(HEADERS interfaces/ISlideShowDelegate.h
+ Exif.h
  GUIDialogPictureInfo.h
  GUIViewStatePictures.h
  GUIWindowPictures.h
  GUIWindowSlideShow.h
+ ImageMetadata.h
+ ImageMetadataParser.h
+ Iptc.h
  Picture.h
  PictureFolderImageFileLoader.h
  PictureInfoLoader.h

xbmc/pictures/Exif.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2023 Team Kodi
+ * This file is part of Kodi - https://kodi.tv
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+constexpr unsigned int MAX_DATE_COPIES = 10;
+constexpr int EXIF_COMMENT_CHARSET_CONVERTED = -1;
+
+struct ExifInfo
+{
+ ExifInfo() = default;
+ ExifInfo(const ExifInfo&) = default;
+ ExifInfo(ExifInfo&&) = default;
+
+ ExifInfo& operator=(const ExifInfo&) = default;
+ ExifInfo& operator=(ExifInfo&&) = default;
+
+ std::string CameraMake;
+ std::string CameraModel;
+ std::string DateTime;
+ int Height{};
+ int Width{};
+ int Orientation{};
+ int IsColor{};
+ std::string Process{};
+ int FlashUsed{};
+ float FocalLength{};
+ float ExposureTime{};
+ float ApertureFNumber{};
+ float Distance{};
+ float CCDWidth{};
+ float ExposureBias{};
+ float DigitalZoomRatio{};
+ int FocalLength35mmEquiv{};
+ int Whitebalance{};
+ int MeteringMode{};
+ int ExposureProgram{};
+ int ExposureMode{};
+ int ISOequivalent{};
+ int LightSource{};
+ //! TODO: Remove me, not needed anymore (still exposed to addon interface)
+ int CommentsCharset{};
+ //! TODO: Remove me, not needed anymore (still exposed to addon interface)
+ int XPCommentsCharset{};
+ std::string Comments;
+ std::string FileComment;
+ std::string XPComment;
+ std::string Description;
+
+ //! TODO: this is not used anywhere, just nuke it
+ unsigned ThumbnailOffset{};
+ unsigned ThumbnailSize{};
+ unsigned LargestExifOffset{};
+ //! TODO: this is not used anywhere, just nuke it
+ char ThumbnailAtEnd{};
+ int ThumbnailSizeOffset{};
+ //! TODO: this is not used anywhere, just nuke it
+ std::vector<int> DateTimeOffsets;
+
+ int GpsInfoPresent{};
+ std::string GpsLat;
+ std::string GpsLong;
+ std::string GpsAlt;
+};

xbmc/pictures/ImageMetadata.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2023 Team Kodi
+ * This file is part of Kodi - https://kodi.tv
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "Exif.h"
+#include "Iptc.h"
+
+struct ImageMetadata
+{
+ ExifInfo exifInfo;
+ IPTCInfo iptcInfo;
+};