Merge pull request #24109 from enen92/exiv2

Pictures: Move image metadata processing to exiv2 as a new dependency
xbmc · Jun 23, 2024 · 45a36c9 · 45a36c9
2 parents 6818de7 + a9ba56b
commit 45a36c9
Show file tree

Hide file tree

Showing 49 changed files with 2,289 additions and 1,479 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,6 +90,7 @@ option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" OFF)
 # These are built for all platforms not using system libs or disabled by user
 dependent_option(ENABLE_INTERNAL_CEC "Enable internal libcec?")
 dependent_option(ENABLE_INTERNAL_CURL "Enable internal libcurl?")
+dependent_option(ENABLE_INTERNAL_EXIV2 "Enable internal exiv2?")
 dependent_option(ENABLE_INTERNAL_FLATBUFFERS "Enable internal flatbuffers?")
 dependent_option(ENABLE_INTERNAL_FMT "Enable internal fmt?")
 dependent_option(ENABLE_INTERNAL_NFS "Enable internal libnfs?")
@@ -209,6 +210,7 @@ set(required_deps ASS>=0.15.0
  Cdio
  CrossGUID
  Curl
+ Exiv2
  FFMPEG
  FlatBuffers
  Fmt

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -4284,6 +4284,7 @@ msgid "Video"
 msgstr ""
 
 #: xbmc/dialogs/GUIDialogMediaSource.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#1213"
 msgid "Pictures"
 msgstr ""
@@ -7286,6 +7287,8 @@ msgstr ""
 
 #: system/settings/settings.xml
 #: xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#13419"
 msgid "Software"
 msgstr ""
@@ -14951,145 +14954,198 @@ msgstr ""
 
 #empty strings from id 21603 to 21799
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21800"
 msgid "File name"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21801"
 msgid "File path"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21802"
 msgid "File size"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21803"
 msgid "File date / time"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21804"
 msgid "Slide index"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21805"
 msgid "Resolution"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21806"
 msgid "Comment"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21807"
 msgid "Colour / B&W"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21808"
 msgid "JPEG process"
 msgstr ""
 
 #empty strings from id 21809 to 21819
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21820"
 msgid "Date / Time"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21821"
 msgid "Description"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21822"
 msgid "Camera make"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: addons/skin.estuary/xml/Variables.xml
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21823"
 msgid "Camera model"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21824"
 msgid "EXIF comment"
 msgstr ""
 
-msgctxt "#21825"
-msgid "Firmware"
-msgstr ""
+#empty string with id 21825
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: addons/skin.estuary/xml/Variables.xml
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21826"
 msgid "Aperture"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: addons/skin.estuary/xml/Variables.xml
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21827"
 msgid "Focal length"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21828"
 msgid "Focus distance"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21829"
 msgid "Exposure"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: addons/skin.estuary/xml/Variables.xml
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21830"
 msgid "Exposure time"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21831"
 msgid "Exposure bias"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21832"
 msgid "Exposure mode"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21833"
 msgid "Flash used"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21834"
 msgid "White-balance"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21835"
 msgid "Light source"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21836"
 msgid "Metering mode"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21837"
 msgid "ISO"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21838"
 msgid "Digital zoom"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21839"
 msgid "CCD width"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21840"
 msgid "GPS latitude"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21841"
 msgid "GPS longitude"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21842"
 msgid "GPS altitude"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21843"
 msgid "Orientation"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21844"
 msgid "XP comment"
 msgstr ""
@@ -15102,100 +15158,137 @@ msgstr ""
 
 #empty strings from id 21846 to 21856
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21857"
 msgid "Sub-location"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21858"
 msgid "Image type"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21859"
 msgid "Time created"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21860"
 msgid "Supplemental categories"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21861"
 msgid "Keywords"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21862"
 msgid "Caption"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21863"
 msgid "Author"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21864"
 msgid "Headline"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21865"
 msgid "Special instructions"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21866"
 msgid "Category"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21867"
 msgid "Byline"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21868"
 msgid "Byline title"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21869"
 msgid "Credit"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21870"
 msgid "Source"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21871"
 msgid "Copyright notice"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21872"
 msgid "Object name"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21873"
 msgid "City"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21874"
 msgid "State"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: addons/skin.estuary/xml/DialogVideoInfo.xml
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21875"
 msgid "Country"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21876"
 msgid "Original TX reference"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 #: xbmc/playlist/SmartPlayList.cpp
 msgctxt "#21877"
 msgid "Date created"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21878"
 msgid "Urgency"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
+#: addons/skin.estuary/xml/MyPics.xml
 msgctxt "#21879"
 msgid "Country code"
 msgstr ""
 
+#: xbmc/pictures/GUIDialogPictureInfo.cpp
 msgctxt "#21880"
 msgid "Reference service"
 msgstr ""

diff --git a/addons/skin.estuary/xml/MyPics.xml b/addons/skin.estuary/xml/MyPics.xml
@@ -69,7 +69,7 @@
  <param name="value" value="ListItem.PictureBylineTitle" />
  </include>
  <include content="PicsInfoLine">
- <param name="label" value="$LOCALIZE[31041]"/>
+ <param name="label" value="$LOCALIZE[21822]"/>
  <param name="value" value="ListItem.PictureCamMake" />
  </include>
  <include content="PicsInfoLine">

diff --git a/cmake/installdata/test-reference-data.txt b/cmake/installdata/test-reference-data.txt
@@ -25,6 +25,8 @@ xbmc/filesystem/test/refRARstored.rar
 xbmc/network/test/data/test-ranges.txt
 xbmc/network/test/data/test.html
 xbmc/network/test/data/test.png
+xbmc/pictures/metadata/test/testdata/exifgps.jpg
+xbmc/pictures/metadata/test/testdata/iptc.jpg
 xbmc/playlists/test/test.asx
 xbmc/playlists/test/test.b4s
 xbmc/playlists/test/test.pxml