Merge pull request #1298 from luxonis/v3_visualizer_windows

V3 visualizer windows

Author: moratom

cmake/Depthai/DepthaiVisualizerConfig.cmake

@@ -1,2 +1,2 @@
 # "full commit hash of depthai visualizer static files"
-set(DEPTHAI_VISUALIZER_COMMIT "0.9.20")
+set(DEPTHAI_VISUALIZER_COMMIT "0.9.22")

cmake/DepthaiVisualizerDownloader.cmake

@@ -39,9 +39,9 @@ function(DepthaiVisualizerDownloader)
     # Download firmware package
     message(STATUS "Downloading and checking ${device_type}-fwp.tar.xz")
     DownloadAndChecksum(
-        "${_download_directory_url}/${visualizer_hash}/depthai-visualizer-${visualizer_hash}.tar.gz" # File
-        "${_download_directory_url}/${visualizer_hash}/depthai-visualizer-${visualizer_hash}.tar.gz.sha256" # File checksum
-        "${folder}/depthai-visualizer-${visualizer_hash}.tar.gz"
+        "${_download_directory_url}/${visualizer_hash}/depthai-visualizer-${visualizer_hash}.tar.xz" # File
+        "${_download_directory_url}/${visualizer_hash}/depthai-visualizer-${visualizer_hash}.tar.xz.sha256" # File checksum
+        "${folder}/depthai-visualizer-${visualizer_hash}.tar.xz"
         status
     )
     if(${status})
@@ -50,7 +50,7 @@ function(DepthaiVisualizerDownloader)
         message(FATAL_ERROR "Aborting.\n")
     endif()
     # add depthai-device-kb-fwp.tar.xz to list
-    list(APPEND "${output_list_var}" "${folder}/depthai-visualizer-${visualizer_hash}.tar.gz")
+    list(APPEND "${output_list_var}" "${folder}/depthai-visualizer-${visualizer_hash}.tar.xz")
 
 
     # Set list of files as output

include/depthai/pipeline/datatype/ImageAnnotations.hpp

@@ -41,13 +41,16 @@ CMRC_DECLARE(depthai);
 
 namespace dai {
 
-TarGzAccessor::TarGzAccessor(const std::vector<std::uint8_t>& tarGzFile) {
-    // Load tar.gz archive from memory
+TarXzAccessor::TarXzAccessor(const std::vector<std::uint8_t>& tarGzFile) {
+    // Load tar.xz archive from memory
     struct archive* archive = archive_read_new();
     assert(archive != nullptr);
 
-    archive_read_support_filter_gzip(archive);  // Support for gzip compression
-    archive_read_support_format_tar(archive);   // Support for tar format
+    auto err = archive_read_support_format_tar(archive);  // Support for tar format
+    assert(err == ARCHIVE_OK);
+
+    err = archive_read_support_filter_xz(archive);  // Support for xz compression
+    assert(err == ARCHIVE_OK);
 
     // Open the memory archive
     int r = archive_read_open_memory(archive, tarGzFile.data(), tarGzFile.size());
@@ -72,27 +75,27 @@ TarGzAccessor::TarGzAccessor(const std::vector<std::uint8_t>& tarGzFile) {
 }
 
 // Method to get file data by path
-std::optional<std::vector<std::uint8_t>> TarGzAccessor::getFile(const std::string& path) const {
+std::optional<std::vector<std::uint8_t>> TarXzAccessor::getFile(const std::string& path) const {
     auto it = resourceMap.find(path);
     if(it != resourceMap.end()) {
         return it->second;  // Return the file data
     }
     return std::nullopt;  // Return empty optional if file not found
 }
 
-TarGzAccessor Resources::getEmbeddedVisualizer() const {
+TarXzAccessor Resources::getEmbeddedVisualizer() const {
 #ifdef DEPTHAI_EMBED_FRONTEND
     // Load visualizer tar.gz archive from memory
     auto fs = cmrc::depthai::get_filesystem();
-    constexpr static auto FILE_NAME = "depthai-visualizer-" DEPTHAI_VISUALIZER_VERSION ".tar.gz";
+    constexpr static auto FILE_NAME = "depthai-visualizer-" DEPTHAI_VISUALIZER_VERSION ".tar.xz";
     if(!fs.exists(FILE_NAME)) {
         throw std::runtime_error("Visualizer not found in embedded resources");
     }
     auto visualizerTarGz = fs.open(FILE_NAME);
     std::vector<std::uint8_t> visualizerTarGzData(visualizerTarGz.begin(), visualizerTarGz.end());
 
     // Create and return TarGzAccessor
-    return TarGzAccessor(visualizerTarGzData);
+    return TarXzAccessor(visualizerTarGzData);
 #else
     throw std::runtime_error("Visualizer not embedded in resources");
 #endif

src/utility/Resources.cpp

@@ -17,10 +17,10 @@
 
 namespace dai {
 
-class TarGzAccessor {
+class TarXzAccessor {
    public:
     // Constructor takes a tar.gz file in memory (std::vector<std::uint8_t>)
-    TarGzAccessor(const std::vector<std::uint8_t>& tarGzFile);
+    TarXzAccessor(const std::vector<std::uint8_t>& tarGzFile);
 
     // Function to get file data by path
     std::optional<std::vector<std::uint8_t>> getFile(const std::string& path) const;
@@ -58,7 +58,7 @@ class Resources {
     std::vector<std::uint8_t> getBootloaderFirmware(DeviceBootloader::Type type = DeviceBootloader::Type::USB) const;
     std::vector<std::uint8_t> getDeviceRVC3Fwp() const;
     std::vector<std::uint8_t> getDeviceRVC4Fwp() const;
-    TarGzAccessor getEmbeddedVisualizer() const;
+    TarXzAccessor getEmbeddedVisualizer() const;
 };
 
 }  // namespace dai