Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(editor): pick the last preview frame strictly before the end
Aditya Garudb7f7fba50abb
diff --git a/crates/editor/src/editor_instance.rs b/crates/editor/src/editor_instance.rsindex 67b632968..caeaac19a 100644--- a/crates/editor/src/editor_instance.rs+++ b/crates/editor/src/editor_instance.rs@@ -1083,7 +1083,11 @@ impl EditorInstance {.map(|timeline| timeline.duration()).unwrap_or(0.0);let total_frames = (total_duration * f64::from(fps)).ceil() as u32;- let frame_number = frame_number.min(total_frames.saturating_sub(1));+ let mut last_frame = total_frames.saturating_sub(1);+ if f64::from(last_frame) / f64::from(fps) >= total_duration {+ last_frame = last_frame.saturating_sub(1);+ }+ let frame_number = frame_number.min(last_frame);let frame_time = frame_number as f64 / fps as f64;let transition_mapping = project.timeline.as_ref().and_then(|timeline| {if timeline.transitions.is_empty() {diff --git a/crates/verify/tests/seek.rs b/crates/verify/tests/seek.rsindex cf11a7bc1..1045e948a 100644--- a/crates/verify/tests/seek.rs+++ b/crates/verify/tests/seek.rs@@ -22,6 +22,7 @@ fn paused_preview_at_timeline_end() {use cap_editor::{AudioOutput, EditorFrameOutput, EditorInstance};use cap_project::XY;use cap_verify::fixture;+ use cap_verify::video_code::{FrameMarker, StreamKind};let id = "seek/basic/paused-end30/editor";if !report::selected(id) {@@ -55,13 +56,14 @@ fn paused_preview_at_timeline_end() {.unwrap();let result = async {- for (cuts, requested, expected) in [- (vec![(0.0, 6.0, 1.0)], 0, 0),- (vec![(0.0, 6.0, 1.0)], 180, 179),- (vec![(3.0, 4.0, 1.0)], 179, 29),- (vec![(3.0, 4.01, 1.0)], 31, 30),- (vec![(3.0, 3.01, 1.0)], 1, 0),- (vec![(0.0, 1.0, 1.0), (3.0, 4.0, 1.0)], 30, 30),+ for (cuts, requested, expected, expected_source) in [+ (vec![(0.0, 6.0, 1.0)], 0, 0, 0),+ (vec![(0.0, 6.0, 1.0)], 180, 179, 179),+ (vec![(3.0, 4.0, 1.0)], 179, 29, 119),+ (vec![(3.0, 4.01, 1.0)], 31, 30, 120),+ (vec![(3.0, 3.01, 1.0)], 1, 0, 90),+ (vec![(0.0, 31.0 / 30.0, 1.0)], 31, 30, 30),+ (vec![(0.0, 1.0, 1.0), (3.0, 4.0, 1.0)], 30, 30, 90),] {let mut config = project.config();common::set_cuts(&mut config, &cuts);@@ -91,6 +93,15 @@ fn paused_preview_at_timeline_end() {order: cap_verify::video_code::PixelOrder::Rgba,};let readout = common::read_expecting(&view, &model.expect(expected, 30));+ for kind in StreamKind::ALL {+ let marker = FrameMarker::new(kind, 0, expected_source);+ if readout.get(kind).marker() != Some(marker) {+ return Err(format!(+ "request {requested}: got {:?}, expected {marker:?}",+ readout.get(kind)+ ));+ }+ }common::check_requests(&mut case, &model, &[expected], &[readout], 30);}Ok::<_, String>(())