Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

perf(rendering): share one Arc per Tauri preview and time only the constructor

Aditya Garud82b1256c725b
diff --git a/apps/desktop/src-tauri/src/export.rs b/apps/desktop/src-tauri/src/export.rs
index 6384881dc..662fe6791 100644
--- a/apps/desktop/src-tauri/src/export.rs
+++ b/apps/desktop/src-tauri/src/export.rs
@@ -1950,6 +1950,7 @@ async fn generate_export_preview_inner(
.map(|segment| segment.display.duration)
.collect::<Vec<_>>(),
);
+ let project_config = Arc::new(project_config);
let render_constants = Arc::new(
RenderVideoConstants::new(
@@ -2038,7 +2039,7 @@ async fn generate_export_preview_inner(
let uniforms = ProjectUniforms::new(
&render_constants,
- &Arc::new(project_config.clone()),
+ &project_config,
frame_number,
settings.fps,
settings.resolution_base,
@@ -2083,7 +2084,7 @@ async fn generate_export_preview_inner(
outgoing_zoom.ensure_precomputed_until((frame_number as f32 + 1.0) / settings.fps as f32);
let outgoing_uniforms = ProjectUniforms::new(
&render_constants,
- &Arc::new(project_config.clone()),
+ &project_config,
frame_number,
settings.fps,
settings.resolution_base,
@@ -2546,6 +2547,7 @@ async fn generate_export_preview_fast_inner(
})
.await
.map_err(|error| format!("Failed to synchronize export preview timing: {error}"))?;
+ let project_config = Arc::new(project_config);
let transition_mapping = project_config.timeline.as_ref().and_then(|timeline| {
if timeline.transitions.is_empty() {
return None;
@@ -2602,7 +2604,7 @@ async fn generate_export_preview_fast_inner(
let uniforms = ProjectUniforms::new(
&editor.render_constants,
- &Arc::new(project_config.clone()),
+ &project_config,
frame_number,
settings.fps,
settings.resolution_base,
@@ -2649,7 +2651,7 @@ async fn generate_export_preview_fast_inner(
outgoing_zoom.ensure_precomputed_until((frame_number as f32 + 1.0) / settings.fps as f32);
let outgoing_uniforms = ProjectUniforms::new(
&editor.render_constants,
- &Arc::new(project_config.clone()),
+ &project_config,
frame_number,
settings.fps,
settings.resolution_base,
diff --git a/apps/desktop/src-tauri/src/screenshot_editor.rs b/apps/desktop/src-tauri/src/screenshot_editor.rs
index 2992b1424..0d903fdc4 100644
--- a/apps/desktop/src-tauri/src/screenshot_editor.rs
+++ b/apps/desktop/src-tauri/src/screenshot_editor.rs
@@ -469,7 +469,7 @@ impl ScreenshotEditorInstances {
);
let shutdown_token = render_shutdown_token;
let mut current_update = config_rx.borrow().clone();
- let mut current_config = current_update.config.clone();
+ let mut current_config = std::sync::Arc::new(current_update.config.clone());
let mut current_revision = current_update.revision;
let mut first_frame_logged = false;
@@ -507,7 +507,7 @@ impl ScreenshotEditorInstances {
let uniforms = ProjectUniforms::new(
&constants,
- &std::sync::Arc::new(current_config.clone()),
+ &current_config,
0,
30,
cap_project::XY::new(base_w, base_h),
@@ -564,7 +564,7 @@ impl ScreenshotEditorInstances {
}
current_update = config_rx.borrow().clone();
current_revision = current_update.revision;
- current_config = current_update.config.clone();
+ current_config = std::sync::Arc::new(current_update.config.clone());
}
_ = shutdown_token.cancelled() => {
break;
@@ -989,7 +989,7 @@ pub async fn prewarm_screenshot_renderer() {
Arc::new(cap_rendering::BackgroundTextureCache::default()),
);
- let config = ProjectConfiguration::default();
+ let config = std::sync::Arc::new(ProjectConfiguration::default());
let mut frame_renderer = FrameRenderer::new(&constants);
let mut layers = RendererLayers::new_with_options(
&constants.device,
@@ -1023,7 +1023,7 @@ pub async fn prewarm_screenshot_renderer() {
zoom_timeline.ensure_precomputed_until(1.0 / 30.0);
let uniforms = ProjectUniforms::new(
&constants,
- &std::sync::Arc::new(config.clone()),
+ &config,
0,
30,
cap_project::XY::new(base_w, base_h),
@@ -1637,7 +1637,7 @@ pub async fn render_screenshot_project_for_export(
pub async fn render_screenshot_png(instance: &ScreenshotEditorInstance) -> Result<Vec<u8>, String> {
let path = instance.path.clone();
- let config = instance.config_tx.borrow().config.clone();
+ let config = std::sync::Arc::new(instance.config_tx.borrow().config.clone());
let width = instance.image_width;
let height = instance.image_height;
@@ -1825,7 +1825,7 @@ pub async fn render_screenshot_png(instance: &ScreenshotEditorInstance) -> Resul
zoom_timeline.ensure_precomputed_until(1.0 / 30.0);
let uniforms = ProjectUniforms::new(
&constants,
- &std::sync::Arc::new(config.clone()),
+ &config,
0,
30,
resolution_base,
diff --git a/crates/rendering/src/lib.rs b/crates/rendering/src/lib.rs
index 169e65b56..469a75133 100644
--- a/crates/rendering/src/lib.rs
+++ b/crates/rendering/src/lib.rs
@@ -10419,6 +10419,16 @@ mod project_uniforms_tests {
use std::hint::black_box;
let constants = cursor_test_constants().await;
+ let screen_size = constants.options.screen_size;
+ let events = CursorEvents::default();
+ let frames = DecodedSegmentFrames {
+ screen_size,
+ screen_frame: Some(DecodedFrame::new(Vec::new(), screen_size.x, screen_size.y)),
+ camera_frame: None,
+ segment_time: 0.0,
+ recording_time: 0.0,
+ segment_has_camera: false,
+ };
for (transcript, segments) in [
("none", 0),
("10 min", 200),
@@ -10426,11 +10436,26 @@ mod project_uniforms_tests {
("60 min", 1200),
] {
let project = Arc::new(captioned_project(segments));
+ let mut zoom_timeline =
+ ZoomTransformTimeline::from_project(&project, &events, 60.0, screen_size);
+ zoom_timeline.ensure_precomputed_until(60.0);
let mut runs: Vec<f64> = (0..400)
.map(|frame| {
let start = Instant::now();
- black_box(uniforms_at(&constants, &project, frame % 1800));
- start.elapsed().as_secs_f64() * 1_000_000.0
+ let uniforms = ProjectUniforms::new(
+ &constants,
+ &project,
+ frame % 1800,
+ 30,
+ screen_size,
+ &events,
+ &frames,
+ 60.0,
+ &zoom_timeline,
+ );
+ let elapsed = start.elapsed().as_secs_f64() * 1_000_000.0;
+ black_box(uniforms);
+ elapsed
})
.collect();
runs.sort_by(f64::total_cmp);