Merge pull request #624 from Kicer86/exiftool_replacement

Exiftool replacement
Kicer86 · May 11, 2024 · a1ad7d9 · a1ad7d9
2 parents 664db9a + 7184492
commit a1ad7d9
Show file tree

Hide file tree

Showing 40 changed files with 336 additions and 908 deletions.
diff --git a/.github/aur/photobroom-git/PKGBUILD b/.github/aur/photobroom-git/PKGBUILD
@@ -8,7 +8,7 @@ url="https://github.com/Kicer86/photobroom"
 license=('GPL3')
 groups=()
 depends=('exiv2' 'qt6-base' 'qt6-multimedia' 'qt6-declarative' 'qt6-svg' 'qt6-quick3d' 'dlib' 'opencv' 'jsoncpp')
-makedepends=('cmake' 'magic_enum' 'qt6-tools' 'imagemagick' 'libwebp' 'cs-libguarded' 'boost' 'openmp')
+makedepends=('cmake' 'ffmpeg' 'magic_enum' 'qt6-tools' 'imagemagick' 'libwebp' 'cs-libguarded' 'boost' 'openmp')
 optdepends=()
 provides=('photobroom')
 conflicts=('photobroom')

diff --git a/.github/expected_file_list b/.github/expected_file_list
@@ -8,6 +8,10 @@ $PLUGINSDIR\System.dll
 $PLUGINSDIR\UserInfo.dll
 advapi32.dll
 animatedwebp.dll
+avcodec-60.dll
+avformat-60.dll
+avutil-58.dll
+bcrypt.dll
 concrt140.dll
 core.dll
 cpp_restapi.dll
@@ -624,11 +628,11 @@ QtQuick\tooling\Signal.qml
 QtQuick\Window\qmldir
 QtQuick\Window\quickwindowplugin.dll
 QtQuick\Window\quickwindow.qmltypes
+secur32.dll
 shell32.dll
 shlwapi.dll
 sql_backend_base.dll
 system.dll
-tools\ExifTool\exiftool.exe
 translations\qt_ar.qm
 translations\qt_bg.qm
 translations\qt_ca.qm
@@ -661,6 +665,7 @@ translations\qt_zh_TW.qm
 tr\photo_broom_en.qm
 tr\photo_broom_pl.qm
 updater.dll
+user32.dll
 vcruntime140_1.dll
 vcruntime140.dll
 ws2_32.dll

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -24,6 +24,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
+        lfs: true
 
     - name: Install system dependencies
       run: |
@@ -77,7 +78,7 @@ jobs:
         cd exiv2
         mkdir build
         cd build
-        cmake ..
+        cmake .. -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_BUILD_EXIV2_COMMAND=OFF -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_BUILD_SAMPLES=OFF
         cmake --build . --target all
         sudo cmake --build . --target install
 

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -29,6 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
+        lfs: true
 
     - name: Install system dependencies
       run: |
@@ -52,6 +53,7 @@ jobs:
           libqt6shadertools6-dev            \
           libqt6svg6-dev                    \
           libqt6quick3druntimerender6       \
+          libavformat-dev                   \
           libboost-dev                      \
           libopencv-dev                     \
           libdlib-dev                       \
@@ -65,7 +67,7 @@ jobs:
       if: matrix.compiler.compiler == 'LLVM'
       run: |
         sudo apt-get install    \
-          clang                 \
+          clang
 
     - name: Install magic enum
       run: |
@@ -88,7 +90,7 @@ jobs:
         cd exiv2
         mkdir build
         cd build
-        cmake ..
+        cmake .. -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_BUILD_EXIV2_COMMAND=OFF -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_BUILD_SAMPLES=OFF
         cmake --build . --target all
         sudo cmake --build . --target install
 

diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "src/third_party/reflect-cpp"]
 	path = src/third_party/reflect-cpp
 	url = https://github.com/getml/reflect-cpp.git
+[submodule "src/core/learning_tests/test-videos"]
+	path = src/core/learning_tests/test-videos
+	url = https://github.com/Kicer86/VOF-media.git
diff --git a/cmake/system/win32.cmake b/cmake/system/win32.cmake
@@ -3,28 +3,6 @@
 # http://stackoverflow.com/questions/17446981/cmake-externalproject-add-and-findpackage
 
 
-function(download_tools)
-    set(EXIFTOOL_VER 12.77)
-    if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/tools/exiftool-${EXIFTOOL_VER}.zip)
-        message("Downloading ExifTool")
-        file(DOWNLOAD
-            https://exiftool.org/exiftool-${EXIFTOOL_VER}.zip ${CMAKE_CURRENT_BINARY_DIR}/tools/exiftool-${EXIFTOOL_VER}.zip
-            SHOW_PROGRESS
-        )
-        file(ARCHIVE_EXTRACT
-            INPUT ${CMAKE_CURRENT_BINARY_DIR}/tools/exiftool-${EXIFTOOL_VER}.zip
-            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tools
-        )
-    endif()
-
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tools/exiftool\(-k\).exe
-        DESTINATION tools/ExifTool/
-        RENAME exiftool.exe
-    )
-
-endfunction(download_tools)
-
-
 function(addDependenciesInstallStep)
 
     find_package(Qt6 REQUIRED COMPONENTS Core)
@@ -48,9 +26,6 @@ endfunction(addDependenciesInstallStep)
 #install dependencies
 addDependenciesInstallStep()
 
-#download tools
-download_tools()
-
 #uninstall previous version of photo broom
 set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 

diff --git a/src/config.hpp.in b/src/config.hpp.in
@@ -1,2 +1,4 @@
 
 #define PHOTO_BROOM_VERSION "@PROJECT_VERSION@"
+#define PHOTO_BROOM_SRC_DIR(path) "@PROJECT_SOURCE_DIR@/" path
+#define PHOTO_BROOM_BIN_DIR(path) "@PROJECT_BINARY_DIR@/" path
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1,9 +1,10 @@
 
-find_package(OpenCV           REQUIRED)
-find_package(Qt6              REQUIRED COMPONENTS Core Gui Multimedia)
+find_package(CsLibGuarded     REQUIRED)
 find_package(exiv2            REQUIRED)
+find_package(FFmpeg           COMPONENTS AVCODEC AVFORMAT AVUTIL REQUIRED)
+find_package(OpenCV           REQUIRED)
+find_package(Qt6              REQUIRED COMPONENTS Core Gui)
 find_package(Threads          REQUIRED)
-find_package(CsLibGuarded     REQUIRED)
 
 include(GenerateExportHeader)
 
@@ -18,10 +19,17 @@ else()
     set(EXIV2_LIB exiv2lib)
 endif()
 
+# FFmpeg's list of libraries may come with many duplicated entries (with and without absolute paths) which causes
+# havoc on Windows. Remove all duplicates and entries which do not come with absolute path
+list(REMOVE_DUPLICATES FFMPEG_LIBRARIES)
+if(WIN32)
+    list(FILTER FFMPEG_LIBRARIES INCLUDE REGEX "[a-zA-Z]\\:/")
+endif()
+
+
 set(CORE_SOURCES
     implementation/aexif_reader.hpp                         implementation/aexif_reader.cpp
     implementation/configuration_p.hpp
-    implementation/exiftool_video_details_reader.hpp        implementation/exiftool_video_details_reader.cpp
     implementation/exiv2_exif_reader.hpp                    implementation/exiv2_exif_reader.cpp
                                                             implementation/hdr_assembler.cpp
     implementation/image_media_information.hpp              implementation/image_media_information.cpp
@@ -102,7 +110,7 @@ target_link_libraries(core
     PUBLIC
         Qt::Core
         Qt::Gui
-        Qt::Multimedia
+        ${FFMPEG_LIBRARIES}
     PRIVATE
         system
         ${CMAKE_THREAD_LIBS_INIT}

diff --git a/src/core/constants.hpp b/src/core/constants.hpp
@@ -19,11 +19,6 @@ namespace ConfigConsts
 }
 
 
-namespace ExternalToolsConfigKeys
-{
-    const char* const exiftoolPath = "tool_path::exiftool";
-}
-
 namespace Parameters
 {
     const QSize databaseThumbnailSize(400, 400);

diff --git a/src/core/core_test.cmake b/src/core/core_test.cmake
@@ -1,6 +1,8 @@
 
 include(${CMAKE_SOURCE_DIR}/cmake/functions.cmake)
 
+find_package(exiv2   REQUIRED)
+find_package(FFmpeg  COMPONENTS AVCODEC AVFORMAT AVUTIL REQUIRED)
 find_package(GTest   REQUIRED CONFIG)
 find_package(Qt6     REQUIRED COMPONENTS Core Gui)
 find_package(Qt6Test REQUIRED)
@@ -70,19 +72,19 @@ if (BUILD_LEARNING_TESTS)
             ${hdr_photos_list}
     )
 
-    add_executable(core_lt_for_opencv
-        learning_tests/image_aligner_tests.cpp
+    add_executable(core_lt
         learning_tests/hdr_assembler_tests.cpp
+        learning_tests/image_aligner_tests.cpp
     )
 
-    target_include_directories(core_lt_for_opencv
+    target_include_directories(core_lt
         PRIVATE
             ${CMAKE_SOURCE_DIR}/src
             ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_CURRENT_BINARY_DIR}
     )
 
-    target_link_libraries(core_lt_for_opencv
+    target_link_libraries(core_lt
         PRIVATE
             core
 
@@ -94,36 +96,41 @@ if (BUILD_LEARNING_TESTS)
             GTest::gmock_main
     )
 
-    add_dependencies(core_lt_for_opencv
+    add_dependencies(core_lt
         core_tests_images
         hdr_photos
     )
 
     add_test(
-        NAME core_learning_tests_for_opencv
-        COMMAND core_lt_for_opencv
+        NAME core_learning_tests
+        COMMAND core_lt
     )
 
-    set_tests_properties(core_learning_tests_for_opencv PROPERTIES LABELS "LearningTest")
+    set_tests_properties(core_learning_tests PROPERTIES LABELS "LearningTest")
 endif()
 
 
 add_executable(core_ut
+    implementation/aexif_reader.cpp
     implementation/base_tags.cpp
+    implementation/exiv2_exif_reader.cpp
+    implementation/exif_reader_factory.cpp
     implementation/data_from_path_extractor.cpp
     #implementation/oriented_image.cpp
-    implementation/exiftool_video_details_reader.cpp
     implementation/image_aligner.cpp
+    implementation/image_media_information.cpp
+    implementation/media_information.cpp
+    implementation/media_types.cpp
     implementation/model_compositor.cpp
     implementation/qmodelindex_selector.cpp
     implementation/qmodelindex_comparator.cpp
+    implementation/video_media_information.cpp
     implementation/tag.cpp
     implementation/task_executor_utils.cpp
     imodel_compositor_data_source.hpp
 
     unit_tests/containers_utils_tests.cpp
     unit_tests/data_from_path_extractor_tests.cpp
-    unit_tests/exiftool_video_details_reader_tests.cpp
     unit_tests/function_wrappers_tests.cpp
     unit_tests/image_aligner_tests.cpp
     unit_tests/json_serializer_tests.cpp
@@ -134,10 +141,13 @@ add_executable(core_ut
     unit_tests/qmodelindex_selector_tests.cpp
     unit_tests/status_tests.cpp
     unit_tests/tag_value_tests.cpp
+    unit_tests/video_metadata_extraction_tests.cpp
 )
 
 target_link_libraries(core_ut
     PRIVATE
+        ${EXIV2_LIB}
+        ${FFMPEG_LIBRARIES}
         GTest::gtest
         GTest::gmock
         GTest::gmock_main
@@ -153,6 +163,7 @@ target_include_directories(core_ut
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_BINARY_DIR}
         ${PROJECT_SOURCE_DIR}/src/third_party/reflect-cpp/include
+        ${PROJECT_BINARY_DIR}
 )
 
 target_compile_definitions(core_ut

diff --git a/src/core/iexif_reader.hpp b/src/core/iexif_reader.hpp
@@ -28,6 +28,9 @@ struct CORE_EXPORT IExifReader
         Exposure,                   // float
         Projection,                 // string
         ShutterSpeed,               // float (seconds)
+        Xmp_video_DateTimeOriginal, // string
+        Xmp_video_Width,            // int
+        Xmp_video_Height,           // int
     };
 
     virtual ~IExifReader() = default;

diff --git a/src/core/implementation/aexif_reader.cpp b/src/core/implementation/aexif_reader.cpp
@@ -84,31 +84,25 @@ std::optional<std::any> AExifReader::get(const QString& path, const IExifReader:
     switch(type)
     {
         case TagType::SequenceNumber:
-            result = exiv_result(readInt(TagType::SequenceNumber));
-            break;
-
         case TagType::Orientation:
-            result = exiv_result(readInt(TagType::Orientation));
+        case TagType::Xmp_video_Height:
+        case TagType::Xmp_video_Width:
+            result = exiv_result(readInt(type));
             break;
 
         case TagType::DateTimeOriginal:
-            result = exiv_result(readString(TagType::DateTimeOriginal));
+        case TagType::Projection:
+        case TagType::Xmp_video_DateTimeOriginal:
+            result = exiv_result(readString(type));
             break;
 
         case TagType::PixelXDimension:
-            result = exiv_result(readLong(TagType::PixelXDimension));
-            break;
-
         case TagType::PixelYDimension:
-            result = exiv_result(readLong(TagType::PixelYDimension));
+            result = exiv_result(readLong(type));
             break;
 
         case TagType::Exposure:
-            result = exiv_result(readRational(TagType::Exposure));
-            break;
-
-        case TagType::Projection:
-            result = exiv_result(readString(TagType::Projection));
+            result = exiv_result(readRational(type));
             break;
 
         case TagType::ShutterSpeed:

diff --git a/src/core/implementation/aexif_reader.hpp b/src/core/implementation/aexif_reader.hpp
@@ -58,4 +58,4 @@ class AExifReader: public IExifReader
         std::optional<float> readRational(const TagType &) const;
 };
 
-#endif // A_EXIF_READER_HPP
+#endif
diff --git a/src/core/implementation/exif_reader_factory.cpp b/src/core/implementation/exif_reader_factory.cpp
@@ -38,7 +38,7 @@ ExifReaderFactory::ExifReaderFactory(): m_feeders()
 
 IExifReader& ExifReaderFactory::get()
 {
-    //ExifTool may not be thread safe. Prepare separate object for each thread
+    //Exif library may not be thread safe. Prepare separate object for each thread
     const auto id = std::this_thread::get_id();
     auto it = m_feeders.find(id);