Merge pull request #1470 from CapSoftware/recording-optimisations

feat: Recording pipeline optimisations and fail-safes

Author: richiemcilroy

Cargo.lock

@@ -71,6 +71,7 @@ windows-core = "0.60"
 windows-sys = "0.59.0"
 windows-capture = "1.5.0"
 percent-encoding = "2.3.1"
+sysinfo = "0.32"
 
 # TODO: Reenable these: https://github.com/CapSoftware/Cap/issues/859
 [workspace.lints.rust]

Cargo.toml

@@ -9,7 +9,10 @@ use cap_rendering::{
 use image::codecs::jpeg::JpegEncoder;
 use serde::{Deserialize, Serialize};
 use specta::Type;
-use std::{path::PathBuf, sync::Arc};
+use std::{
+    path::PathBuf,
+    sync::{Arc, atomic::Ordering},
+};
 use tracing::{info, instrument};
 
 #[derive(Deserialize, Clone, Copy, Debug, Type)]
@@ -368,15 +371,17 @@ pub async fn generate_export_preview_fast(
 
     let render_start = Instant::now();
 
+    editor.export_preview_active.store(true, Ordering::Release);
     let segment_frames = segment_media
         .decoders
         .get_frames(
             segment_time as f32,
             !project_config.camera.hide,
             clip_config.map(|v| v.offsets).unwrap_or_default(),
         )
-        .await
-        .ok_or_else(|| "Failed to decode frame".to_string())?;
+        .await;
+    editor.export_preview_active.store(false, Ordering::Release);
+    let segment_frames = segment_frames.ok_or_else(|| "Failed to decode frame".to_string())?;
 
     let frame_number = (frame_time * settings.fps as f64).floor() as u32;
 

apps/desktop/src-tauri/icons/tray-default-icon-instant.png

@@ -123,8 +123,10 @@ pub struct GeneralSettingsStore {
     pub instant_mode_max_resolution: u32,
     #[serde(default)]
     pub default_project_name_template: Option<String>,
-    #[serde(default)]
+    #[serde(default = "default_true")]
     pub crash_recovery_recording: bool,
+    #[serde(default = "default_max_fps")]
+    pub max_fps: u32,
 }
 
 fn default_enable_native_camera_preview() -> bool {
@@ -148,6 +150,10 @@ fn default_instant_mode_max_resolution() -> u32 {
     1920
 }
 
+fn default_max_fps() -> u32 {
+    60
+}
+
 fn default_server_url() -> String {
     std::option_env!("VITE_SERVER_URL")
         .unwrap_or("https://cap.so")
@@ -192,6 +198,7 @@ impl Default for GeneralSettingsStore {
             instant_mode_max_resolution: 1920,
             default_project_name_template: None,
             crash_recovery_recording: true,
+            max_fps: 60,
         }
     }
 }

apps/desktop/src-tauri/icons/tray-default-icon-screenshot.png

@@ -54,6 +54,7 @@ pub enum HotkeyAction {
     StartInstantRecording,
     StopRecording,
     RestartRecording,
+    TogglePauseRecording,
     CycleRecordingMode,
     OpenRecordingPicker,
     OpenRecordingPickerDisplay,
@@ -151,6 +152,7 @@ async fn handle_hotkey(app: AppHandle, action: HotkeyAction) -> Result<(), Strin
         HotkeyAction::RestartRecording => recording::restart_recording(app.clone(), app.state())
             .await
             .map(|_| ()),
+        HotkeyAction::TogglePauseRecording => recording::toggle_pause_recording(app.state()).await,
         HotkeyAction::CycleRecordingMode => {
             let current = RecordingSettingsStore::get(&app)
                 .ok()