Updated Gyroflow Core

latenitefilms · Oct 19, 2024 · 2be056d · 2be056d
1 parent ef88cef
commit 2be056d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
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.5"
+version = "1.2.0"
 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 = "cfe0714", features = ["bundle-lens-profiles"] }
+gyroflow-core = { git = "https://github.com/gyroflow/gyroflow.git", default-features = false, rev = "868320b", features = ["bundle-lens-profiles"] }
 log = "0.4.17"
 oslog = "0.2.0"
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
 lru = "0.12"
 nalgebra = { version = "0.32", features = ["serde-serialize"] }
 once_cell = "1.16.0"
-metal = { version = "0.28" }
+metal = { version = "0.29" }
 block2 = "0.2.0"
 simplelog = { git = "https://github.com/Drakulix/simplelog.rs.git", rev = "4ef071d" }
 log-panics = { version = "2.1", features = ["with-backtrace"]}
diff --git a/Source/Frameworks/gyroflow/src/lib.rs b/Source/Frameworks/gyroflow/src/lib.rs
@@ -170,7 +170,8 @@ pub extern "C" fn getDefaultValues(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
 
@@ -253,7 +254,8 @@ pub extern "C" fn getLensIdentifier(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
@@ -325,7 +327,8 @@ pub extern "C" fn isLensProfileLoaded(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
@@ -402,7 +405,8 @@ pub extern "C" fn doesGyroflowProjectContainStabilisationData(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
@@ -498,7 +502,8 @@ pub extern "C" fn hasAccurateTimestamps(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
@@ -586,7 +591,8 @@ pub extern "C" fn loadLensProfile(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
@@ -687,14 +693,15 @@ pub extern "C" fn loadPreset(
         None,
         |_|(),
         cancel_flag,
-        &mut is_preset
+        &mut is_preset,
+        true
     ) {
         Ok(_) => {
             //---------------------------------------------------------
             // Load Preset:
             //---------------------------------------------------------
             let mut is_preset = false;
-            if let Err(e) = stab.import_gyroflow_data(preset_path_string.as_bytes(), true, None, |_|(), Arc::new(AtomicBool::new(false)), &mut is_preset) {
+            if let Err(e) = stab.import_gyroflow_data(preset_path_string.as_bytes(), true, None, |_|(), Arc::new(AtomicBool::new(false)), &mut is_preset, true) {
                 log::error!("[Gyroflow Toolbox Rust] Error loading Preset: {:?}", e);
                 let result = CString::new("FAIL").unwrap();
                 return result.into_raw()
@@ -791,7 +798,7 @@ pub extern "C" fn importMediaFile(
     //---------------------------------------------------------
     // Load video file:
     //---------------------------------------------------------
-    match stab.load_video_file(&media_file_path_string, None) {
+    match stab.load_video_file(&media_file_path_string, None, true) {
         Ok(_) => {
             log::info!("[Gyroflow Toolbox Rust] Video file loaded successfully");
         },
@@ -956,13 +963,14 @@ pub extern "C" fn processFrame(
            CStr::from_ptr(data).to_bytes()
        };
        let mut is_preset = false;
-       match manager.import_gyroflow_data(&data_slice, true, None, |_|(), Arc::new(AtomicBool::new(false)), &mut is_preset) {
+       match manager.import_gyroflow_data(&data_slice, true, None, |_|(), Arc::new(AtomicBool::new(false)), &mut is_preset, true) {
            Ok(_) => {
                 //---------------------------------------------------------
                 // Disable Gyroflow Stretch:
                 //---------------------------------------------------------
                 if disable_gyroflow_stretch != 0 {
-                    manager.disable_lens_stretch();
+                    // TODO: Do we need to expose this an an option?
+                    manager.disable_lens_stretch(false);
                 }
 
                //---------------------------------------------------------