Skip to content

Automatic zoom segment generation #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Automatic zoom segment generation #558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf1076e
Refine automatic zoom from clicks
richiemcilroy May 20, 2025
2b32ffb
reduce time before new segment creation (from click)
richiemcilroy May 20, 2025
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
99 changes: 65 additions & 34 deletions apps/desktop/src-tauri/src/recording.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ use cap_media::{
sources::{CaptureScreen, CaptureWindow},
};
use cap_project::{
Platform, ProjectConfiguration, RecordingMeta, RecordingMetaInner, SharingMeta,
StudioRecordingMeta, TimelineConfiguration, TimelineSegment, ZoomSegment,
cursor::CursorEvents, Platform, ProjectConfiguration, RecordingMeta, RecordingMetaInner,
SharingMeta, StudioRecordingMeta, TimelineConfiguration, TimelineSegment, ZoomMode,
ZoomSegment,
};
use cap_recording::{
instant_recording::{CompletedInstantRecording, InstantRecordingHandle},
Expand Down Expand Up @@ -660,42 +661,72 @@ fn generate_zoom_segments_from_clicks(
recording: &CompletedStudioRecording,
recordings: &ProjectRecordings,
) -> Vec<ZoomSegment> {
let mut segments = vec![];
const ZOOM_SEGMENT_AFTER_CLICK_PADDING: f64 = 1.5;
const ZOOM_DURATION: f64 = 1.0;
const CLICK_GROUP_THRESHOLD: f64 = 0.6; // seconds

let max_duration = recordings.duration();

const ZOOM_SEGMENT_AFTER_CLICK_PADDING: f64 = 1.5;
// Build a temporary RecordingMeta so we can load cursor events from disk
let recording_meta = RecordingMeta {
platform: None,
project_path: recording.project_path.clone(),
pretty_name: String::new(),
sharing: None,
inner: RecordingMetaInner::Studio(recording.meta.clone()),
};

let mut all_events = CursorEvents::default();

match &recording.meta {
StudioRecordingMeta::SingleSegment { segment } => {
if let Some(cursor_path) = &segment.cursor {
if let Ok(mut ev) = CursorEvents::load_from_file(&recording_meta.path(cursor_path))
{
all_events.clicks.append(&mut ev.clicks);
}
}
}
StudioRecordingMeta::MultipleSegments { inner, .. } => {
for seg in &inner.segments {
let mut ev = seg.cursor_events(&recording_meta);
all_events.clicks.append(&mut ev.clicks);
}
}
}

// single-segment only
// for click in &recording.cursor_data.clicks {
// let time = click.process_time_ms / 1000.0;

// if segments.last().is_none() {
// segments.push(ZoomSegment {
// start: (click.process_time_ms / 1000.0 - (ZOOM_DURATION + 0.2)).max(0.0),
// end: click.process_time_ms / 1000.0 + ZOOM_SEGMENT_AFTER_CLICK_PADDING,
// amount: 2.0,
// });
// } else {
// let last_segment = segments.last_mut().unwrap();

// if click.down {
// if last_segment.end > time {
// last_segment.end =
// (time + ZOOM_SEGMENT_AFTER_CLICK_PADDING).min(recordings.duration());
// } else if time < max_duration - ZOOM_DURATION {
// segments.push(ZoomSegment {
// start: (time - ZOOM_DURATION).max(0.0),
// end: time + ZOOM_SEGMENT_AFTER_CLICK_PADDING,
// amount: 2.0,
// });
// }
// } else {
// last_segment.end =
// (time + ZOOM_SEGMENT_AFTER_CLICK_PADDING).min(recordings.duration());
// }
// }
// }
all_events.clicks.sort_by(|a, b| {
a.time_ms
.partial_cmp(&b.time_ms)
.unwrap_or(std::cmp::Ordering::Equal)
});

let mut segments = Vec::<ZoomSegment>::new();

// Generate segments around mouse clicks
for click in &all_events.clicks {
if !click.down {
continue;
}

let time = click.time_ms / 1000.0;

if let Some(last) = segments.last_mut() {
if time <= last.end + CLICK_GROUP_THRESHOLD {
last.end = (time + ZOOM_SEGMENT_AFTER_CLICK_PADDING).min(max_duration);
continue;
}
}

if time < max_duration - ZOOM_DURATION {
segments.push(ZoomSegment {
start: (time - 0.8).max(0.0),
end: (time + ZOOM_SEGMENT_AFTER_CLICK_PADDING).min(max_duration),
amount: 2.0,
mode: ZoomMode::Auto,
});
}
}

segments
}
Expand Down
Loading