Getting ready for v1.1.5 (Build 19)

- Updated from FxPlug v4.2.9 to FxPlug v4.3. - Updated to latest Gyroflow Core. - Need to confirm Rust changes before releasing.
latenitefilms · Jun 25, 2024 · 5b5e3b5 · 5b5e3b5
1 parent 6e37578
commit 5b5e3b5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Source/Configuration/Shared.xcconfig b/Source/Configuration/Shared.xcconfig
@@ -1,4 +1,4 @@
 HARDCODED_DEVELOPER_ID=Developer ID Application: LateNite Films Pty Ltd
-HARDCODED_COPYRIGHT=Copyright © LateNite Films Pty Ltd 2022-2023. All Rights Reserved.
-HARDCODED_VERSION=1.1.4
-HARDCODED_BUILD=18 // Preparing for v1.1.4 (Build 18)
+HARDCODED_COPYRIGHT=Copyright © LateNite Films Pty Ltd 2022-2024. All Rights Reserved.
+HARDCODED_VERSION=1.1.5
+HARDCODED_BUILD=19 // Preparing for v1.1.5 (Build 19)
diff --git a/Source/Frameworks/gyroflow/Cargo.toml b/Source/Frameworks/gyroflow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gyroflow-toolbox"
-version = "1.1.4"
+version = "1.1.5"
 authors = ["Chris Hocking <[email protected]>", "Adrian <[email protected]>"]
 edition = "2021"
 description = "Connects the Gyroflow Toolbox FxPlug4 API to the Gyroflow Core Rust Engine"
@@ -13,14 +13,14 @@ argh = "*"
 serde = "1.0"
 serde_json = "1.0"
 libc = "0.2"
-gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "2b3332d", features = ["bundle-lens-profiles"] }
+gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "cfe0714", features = ["bundle-lens-profiles"] }
 log = "0.4.17"
 oslog = "0.2.0"
 lazy_static = "1.4.0"
 lru = "0.12"
 nalgebra = { version = "0.32", features = ["serde-serialize"] }
 once_cell = "1.16.0"
-metal = { version = "0.27" }
+metal = { version = "0.28" }
 block2 = "0.2.0"
 simplelog = { git = "https://github.com/Drakulix/simplelog.rs.git", rev = "4ef071d" }
-log-panics = { version = "2.1", features = ["with-backtrace"]}
+log-panics = { version = "2.1", features = ["with-backtrace"]}
diff --git a/Source/Frameworks/gyroflow/src/lib.rs b/Source/Frameworks/gyroflow/src/lib.rs
@@ -42,7 +42,7 @@ pub extern "C" fn startLogger(
     if let Ok(file_log) = std::fs::File::create(log_path_string.as_ref()) {
         let _ = simplelog::WriteLogger::init(log::LevelFilter::Debug, log_config, file_log);
     }
-    
+
     //---------------------------------------------------------
     // Load the Lens Profiles:
     //---------------------------------------------------------
@@ -410,20 +410,21 @@ pub extern "C" fn doesGyroflowProjectContainStabilisationData(
             //---------------------------------------------------------
             let has_motion = {
                 let gyro = stab.gyro.read();
+                let metadata = gyro.file_metadata.read();
 
-                log::error!("[Gyroflow Toolbox Rust] gyro.file_metadata.raw_imu: {:?}", gyro.file_metadata.raw_imu);
-                log::error!("[Gyroflow Toolbox Rust] gyro.file_metadata.quaternions: {:?}", gyro.file_metadata.quaternions);
+                log::error!("[Gyroflow Toolbox Rust] gyro.file_metadata.raw_imu: {:?}", metadata.raw_imu);
+                log::error!("[Gyroflow Toolbox Rust] gyro.file_metadata.quaternions: {:?}", metadata.quaternions);
 
-                log::error!("[Gyroflow Toolbox Rust] gyro.raw_imu: {:?}", gyro.raw_imu);
+                //log::error!("[Gyroflow Toolbox Rust] gyro.raw_imu: {:?}", metadata.raw_imu);
                 log::error!("[Gyroflow Toolbox Rust] gyro.quaternions: {:?}", gyro.quaternions);
 
-                log::error!("[Gyroflow Toolbox Rust] detected_source: {:?}", gyro.file_metadata.detected_source);
+                log::error!("[Gyroflow Toolbox Rust] detected_source: {:?}", metadata.detected_source);
 
-                log::error!("[Gyroflow Toolbox Rust] imu_orientation: {:?}", gyro.imu_orientation);
+                log::error!("[Gyroflow Toolbox Rust] imu_orientation: {:?}", metadata.imu_orientation);
                 log::error!("[Gyroflow Toolbox Rust] integration_method: {:?}", gyro.integration_method);
                 log::error!("[Gyroflow Toolbox Rust] file_url: {:?}", gyro.file_url);
 
-                !gyro.raw_imu.is_empty() || !gyro.quaternions.is_empty()
+                !metadata.raw_imu.is_empty() || !gyro.quaternions.is_empty()
             };
 
             //---------------------------------------------------------
@@ -504,8 +505,7 @@ pub extern "C" fn hasAccurateTimestamps(
             // Check if gyroflow project contains stabilization data:
             //---------------------------------------------------------
             let has_accurate_timestamps = {
-                let gyro = stab.gyro.read();
-                gyro.file_metadata.has_accurate_timestamps
+                stab.gyro.read().file_metadata.read().has_accurate_timestamps
             };
 
             //---------------------------------------------------------
@@ -1132,13 +1132,13 @@ pub extern "C" fn processFrame(
    //---------------------------------------------------------
    let _stabilization_result = match pixel_format_string.as_ref() {
        "BGRA8Unorm" => {
-           manager.process_pixels::<BGRA8>(timestamp, &mut buffers)
+           manager.process_pixels::<BGRA8>(timestamp, None, &mut buffers)
         },
        "RGBAf16" => {
-           manager.process_pixels::<RGBAf16>(timestamp, &mut buffers)
+           manager.process_pixels::<RGBAf16>(timestamp, None, &mut buffers)
         },
        "RGBAf" => {
-           manager.process_pixels::<RGBAf>(timestamp, &mut buffers)
+           manager.process_pixels::<RGBAf>(timestamp, None, &mut buffers)
         },
         e => {
             log::error!("[Gyroflow Toolbox Rust] Unsupported pixel format: {:?}", pixel_format_string);