Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ mod thumbnails;
mod tray;
mod update_project_names;
mod upload;
mod upload_health;
pub mod web_api;
mod window_exclusion;
mod window_position_persistence;
Expand Down Expand Up @@ -4189,6 +4190,8 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
recording::restart_recording,
recording::delete_recording,
recording::take_screenshot,
upload_health::get_upload_health_status,
upload_health::refresh_upload_health_status,
recording::import_current_desktop_background,
recording::list_cameras,
recording::get_camera_formats,
Expand Down Expand Up @@ -4492,6 +4495,7 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
app.manage(http_client::RetryableHttpClient::default());
app.manage(PendingScreenshots::default());
app.manage(FinalizingRecordings::default());
app.manage(upload_health::UploadHealthCache::default());

#[cfg(unix)]
{
Expand Down
18 changes: 17 additions & 1 deletion apps/desktop/src-tauri/src/recording.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1326,14 +1326,30 @@ pub async fn start_recording(
let Some(auth) = AuthStore::get(&app).ok().flatten() else {
return Err("Please sign in to use instant recording".to_string());
};
let instant_mode_max_resolution = if auth.is_upgraded() {
let mut instant_mode_max_resolution = if auth.is_upgraded() {
general_settings
.map_or(cap_recording::PRO_INSTANT_MODE_MAX_RESOLUTION, |settings| {
settings.instant_mode_max_resolution
})
} else {
cap_recording::FREE_INSTANT_MODE_MAX_RESOLUTION
};

if let Some(upload_health_cap) =
crate::upload_health::cached_instant_resolution_cap(&app).await
{
let capped_resolution = instant_mode_max_resolution.min(upload_health_cap);
if capped_resolution < instant_mode_max_resolution {
info!(
configured_resolution = instant_mode_max_resolution,
upload_health_cap = upload_health_cap,
capped_resolution = capped_resolution,
"Capping instant recording resolution based on cached upload health"
);
}
instant_mode_max_resolution = capped_resolution;
}

let upload_mode = if matches!(inputs.capture_target, ScreenCaptureTarget::CameraOnly) {
"desktopMP4"
} else {
Expand Down
Loading