Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

fix(export): preserve first-frame hold for offset sources

songsongf09670cbb8d2
diff --git a/crates/compositor/src/timeline_walk.rs b/crates/compositor/src/timeline_walk.rs
index a1c7cf185..e7829180c 100644
--- a/crates/compositor/src/timeline_walk.rs
+++ b/crates/compositor/src/timeline_walk.rs
@@ -262,12 +262,26 @@ unsafe fn catch_up(dec: &mut Decoder, target: f64, clip_start: f64) -> Result<()
/// hide a genuinely truncated camera recording.
const CLIP_START_TAIL_TOLERANCE_SEC: f64 = 0.5;
-/// Seek a clip start within the normal tail margin in either direction.
-/// A seek may return a later frame, so also reject large interior gaps.
+/// Seek a clip start within the normal tail margin. A future frame across an
+/// interior gap is invalid, but a request before the first frame of an offset
+/// stream retains the existing first-frame hold.
unsafe fn seek_clip_start(decoder: &mut Decoder, target: f64) -> Result<bool> {
let frame = decoder.seek_to_or_last(target)?;
- Ok(!frame.is_null()
- && (target - decoder.cur_time_sec()).abs() <= CLIP_START_TAIL_TOLERANCE_SEC + 1e-6)
+ if frame.is_null() {
+ return Ok(false);
+ }
+ let current = decoder.cur_time_sec();
+ if (target - current).abs() <= CLIP_START_TAIL_TOLERANCE_SEC + 1e-6 {
+ return Ok(true);
+ }
+ if current <= target {
+ return Ok(false);
+ }
+ // Only a distant future result needs this extra seek. Distinguish a late
+ // stream origin from a missing interior interval using the actual first
+ // frame, without changing decoder timestamps or the normal seek path.
+ let first = decoder.seek_to(0.0)?;
+ Ok(!first.is_null() && decoder.cur_time_sec() > target)
}
/// `walk_composited_timeline`, qui ne compose que les frames de sortie `only` (triées) quand il y
diff --git a/crates/compositor/tests/export_timing.rs b/crates/compositor/tests/export_timing.rs
index 635722d54..1024ebd67 100644
--- a/crates/compositor/tests/export_timing.rs
+++ b/crates/compositor/tests/export_timing.rs
@@ -9,9 +9,9 @@
//! (red → green → blue → white). A correct export spans all four colours; a
//! mis-advanced one stays red for its whole length.
//!
-//! Needs a D3D11 GPU and the generated media, so it is opt-in: set
+//! Needs a native GPU backend and the generated media, so it is opt-in: set
//! OPENSCREEN_TEST_MEDIA to a directory holding `screen_colors.mp4` and
-//! `webcam_gray.mp4`. The interior-gap test also needs `video_gap.mp4`.
+//! `webcam_gray.mp4`. Gap/origin tests also need the derived fixtures below.
//! Without OPENSCREEN_TEST_MEDIA every test here skips.
//!
//! Regenerate the media with the vendored ffmpeg:
@@ -23,6 +23,8 @@
//! -c:v libopenh264 -g 60 -pix_fmt yuv420p webcam_gray.mp4
//! ffmpeg -i screen_colors.mp4 -vf "select='lt(t,1)+gte(t,3)'" \
//! -fps_mode vfr -c:v libopenh264 -g 60 -pix_fmt yuv420p video_gap.mp4
+//! ffmpeg -i screen_colors.mp4 -c copy -output_ts_offset 1 offset_start.mp4
+//! ffmpeg -i video_gap.mp4 -c copy -output_ts_offset 1 offset_gap.mp4
//! The gap fixture must retain timestamps: video frames stop at 0.983 s and
//! resume at 3.000 s. An equivalent H.264 encoder is sufficient if libopenh264
//! is unavailable.
@@ -441,11 +443,6 @@ fn mp4_export_rejects_a_start_inside_a_multisecond_video_gap() {
eprintln!("skipped: set OPENSCREEN_TEST_MEDIA");
return;
};
- let gap = dir.join("video_gap.mp4");
- assert!(
- gap.exists(),
- "generate video_gap.mp4 using the fixture header recipe"
- );
let out_dir = dir.join(format!("future_frame_gap-{}", std::process::id()));
std::fs::create_dir_all(&out_dir).expect("output dir");
let gpu = Gpu::create(false).expect("gpu");
@@ -457,49 +454,120 @@ fn mp4_export_rejects_a_start_inside_a_multisecond_video_gap() {
codec: ExportCodec::H264,
bit_rate: None,
};
- for camera_gap in [false, true] {
- for after_valid_clip in [false, true] {
- let mut bad = whole_clip(&dir);
- if camera_gap {
- bad.webcam = gap.to_string_lossy().into_owned();
- } else {
- bad.screen = gap.to_string_lossy().into_owned();
- }
- bad.source_start_sec = 1.5;
- bad.source_end_sec = 3.5;
- let mut clips = Vec::new();
- if after_valid_clip {
- clips.push(whole_clip(&dir));
+ for timestamp_offset in [0.0, 1.0] {
+ let gap = dir.join(if timestamp_offset == 0.0 {
+ "video_gap.mp4"
+ } else {
+ "offset_gap.mp4"
+ });
+ assert!(
+ gap.exists(),
+ "generate gap fixtures using the fixture header recipe"
+ );
+ for camera_gap in [false, true] {
+ for after_valid_clip in [false, true] {
+ let mut bad = whole_clip(&dir);
+ if camera_gap {
+ bad.webcam = gap.to_string_lossy().into_owned();
+ } else {
+ bad.screen = gap.to_string_lossy().into_owned();
+ }
+ bad.source_start_sec = 1.5 + timestamp_offset;
+ bad.source_end_sec = 3.5 + timestamp_offset;
+ let mut clips = Vec::new();
+ if after_valid_clip {
+ clips.push(whole_clip(&dir));
+ }
+ clips.push(bad);
+ let out = out_dir.join("out.mp4");
+ std::fs::write(&out, b"previous export").expect("seed destination");
+ let result = pipeline::run_composited_multi(
+ &clips,
+ &out.to_string_lossy(),
+ &gpu,
+ &comp,
+ &Cfg::c8(),
+ &params,
+ &mut |_| {},
+ );
+ let error = result
+ .err()
+ .expect("a future frame cannot stand in for a missing start");
+ let message = format!("{error:#}");
+ assert!(
+ message.contains(if camera_gap { "camera" } else { "screen" }),
+ "{message}"
+ );
+ assert!(
+ message.contains(&format!("clip {}", clips.len())),
+ "{message}"
+ );
+ assert_eq!(std::fs::read(&out).unwrap(), b"previous export");
+ assert_eq!(std::fs::read_dir(&out_dir).unwrap().count(), 1);
+ std::fs::remove_file(out).expect("remove destination");
}
- clips.push(bad);
- let out = out_dir.join("out.mp4");
- std::fs::write(&out, b"previous export").expect("seed destination");
- let result = pipeline::run_composited_multi(
- &clips,
- &out.to_string_lossy(),
- &gpu,
- &comp,
- &Cfg::c8(),
- &params,
- &mut |_| {},
- );
- let error = result
- .err()
- .expect("a future frame cannot stand in for a missing start");
- let message = format!("{error:#}");
- assert!(
- message.contains(if camera_gap { "camera" } else { "screen" }),
- "{message}"
- );
+ }
+ }
+ std::fs::remove_dir(out_dir).expect("remove output dir");
+}
+
+/// A non-zero first video timestamp is a valid stream origin, not an interior gap.
+#[test]
+fn mp4_export_accepts_a_nonzero_first_video_timestamp() {
+ let Some(dir) = media_dir() else {
+ eprintln!("skipped: set OPENSCREEN_TEST_MEDIA");
+ return;
+ };
+ let offset = dir.join("offset_start.mp4");
+ assert!(
+ offset.exists(),
+ "generate offset_start.mp4 using the fixture header recipe"
+ );
+ let out_dir = dir.join(format!("offset_start-{}", std::process::id()));
+ std::fs::create_dir_all(&out_dir).expect("output dir");
+ let gpu = Gpu::create(false).expect("gpu");
+ let comp = Compositor::new_sized(&gpu, 640, 360).expect("compositor");
+ #[cfg(target_os = "macos")]
+ {
+ let mut decoder =
+ pipeline::Decoder::open_for_export(&offset.to_string_lossy(), &gpu).expect("decoder");
+ unsafe {
+ assert!(!decoder.seek_to(0.0).expect("first frame").is_null());
assert!(
- message.contains(&format!("clip {}", clips.len())),
- "{message}"
+ (decoder.cur_time_sec() - 1.0).abs() < 0.01,
+ "fixture must have a non-zero first timestamp"
);
- assert_eq!(std::fs::read(&out).unwrap(), b"previous export");
- assert_eq!(std::fs::read_dir(&out_dir).unwrap().count(), 1);
- std::fs::remove_file(out).expect("remove destination");
}
}
+ let params = ExportParams {
+ width: 640,
+ height: 360,
+ fps: Some(30),
+ codec: ExportCodec::H264,
+ bit_rate: None,
+ };
+ for camera_offset in [false, true] {
+ let mut clip = whole_clip(&dir);
+ if camera_offset {
+ clip.webcam = offset.to_string_lossy().into_owned();
+ } else {
+ clip.screen = offset.to_string_lossy().into_owned();
+ }
+ let out = out_dir.join("out.mp4");
+ let frames = pipeline::run_composited_multi(
+ &[clip],
+ &out.to_string_lossy(),
+ &gpu,
+ &comp,
+ &Cfg::c8(),
+ &params,
+ &mut |_| {},
+ )
+ .expect("a non-zero stream origin must export");
+ assert_eq!(frames.frames, 120);
+ assert!(pipeline::probe_frame_count(&out.to_string_lossy()).expect("decode output") > 0);
+ std::fs::remove_file(out).expect("remove export");
+ }
std::fs::remove_dir(out_dir).expect("remove output dir");
}
diff --git a/technical-documentation/architecture/export-pipeline.md b/technical-documentation/architecture/export-pipeline.md
index 3dac39b6e..eb69eff62 100644
--- a/technical-documentation/architecture/export-pipeline.md
+++ b/technical-documentation/architecture/export-pipeline.md
@@ -142,7 +142,10 @@ and **one** encoder + muxer pair:
more than 0.5 seconds before the clip starts, or cannot produce a frame
within 0.5 seconds of its requested start offset in either direction (including
a seek landing on a future frame across a gap), the shared MP4/GIF timeline walk fails with the clip number and a
- camera-specific explanation. This also covers browser recordings whose
+ camera-specific explanation. A request before a non-zero first-frame timestamp
+ still holds that first frame; this valid stream origin is distinguished from
+ an interior gap by seeking the actual first frame only on the distant-future
+ fallback path. Decoder timestamps and the normal seek path are unchanged. This also covers browser recordings whose
declared container duration outlasts their actual video frames. The user can
re-record the camera or remove its track explicitly; the exporter does not
discard it automatically. A walk producing no video frames is an error,
diff --git a/technical-documentation/testing/manual-e2e-checklist.md b/technical-documentation/testing/manual-e2e-checklist.md
index 3cca78bf3..7327615c8 100644
--- a/technical-documentation/testing/manual-e2e-checklist.md
+++ b/technical-documentation/testing/manual-e2e-checklist.md
@@ -913,6 +913,7 @@ These checks are the human slice: an agent cannot click Apple's picker (see abov
| Date | Build / tag | Platform | Pass/fail | Notes |
|------|-------------|----------|-----------|-------|
+| 2026-10-24 | PR #1379 offset-origin follow-up; rebuilt addon SHA256 `0dd01525a163d8889dd2aaa7088ea0c1e923956b14c430ff70537cba5c24e9d5` | macOS 15.7.1, Apple Silicon | Partial — offset source exported; interior gap still rejected | Computer-use opened a synthetic video whose first decoded timestamp is 1.000 s, with a clip starting at 0. MP4 1080p/30 displayed Saved; independent probing counted 120 frames / 3.967 s at 1752×1080 and full-file decode exited 0. In the same session, opened the interior-gap project and confirmed replacement of that MP4: export reported the screen-start error, destination SHA256 stayed `d45192c6c319006849fee014bc3882141bead0f8b0c43e7c895c51cefe1b7d7b`, and no partial remained. Native regressions cover screen/camera offset sources and interior gaps with both zero and non-zero stream origins. Recording, Presenter Overlay compatibility, unrelated editor features, Windows/Linux runtime and release packaging were not exercised. |
| 2026-10-24 | dev post-merge follow-up to PR #1377 on `79c3aa24`; rebuilt addon SHA256 `53df86189b359d41b63a76e3eaafed5e9bf0e299fe0e89f8fd7950aa12bad6f3` | macOS 15.7.1, Apple Silicon | Partial — interior gap rejected; destination preserved; normal retry passed | Computer-use opened a synthetic screen clip starting at 1.5 s inside a timestamp gap from 0.983 to 3.000 s, then confirmed replacement of an existing synthetic MP4. Export reported that clip 1 had no readable screen frame at its start. Destination SHA256 stayed `854b0911778da18c2a456d3eb227da749c0af2138ad52092180156ed138a6a48`; no partial remained. In the same session, a normal four-second clip plus 10 ms tail exported successfully at 1080p/30: independent ffprobe counted 120 frames / 4.000 s at 1752×1080, and full-file decode exited 0. Native tests also cover camera gaps and failure after a valid preceding clip. Recording, Presenter Overlay compatibility, unrelated editor features, Windows/Linux runtime and release packaging were not exercised. |
| 2026-10-24 | dev CodeRabbit follow-up to PR #1377; rebuilt addon SHA256 `8fe1baab14e941a5ba6d73b5596a27190a75edcd8b49630b451868f829bdaf71` | macOS 15.7.1, Apple Silicon | Partial — undecodable output rejected; destination preserved; retry passed | Computer-use reopened the same synthetic tail-only project used in the previous run, selected an existing synthetic MP4, and confirmed the native replace prompt. Export now reports validation failure instead of Saved. Destination SHA256 remained `854b0911778da18c2a456d3eb227da749c0af2138ad52092180156ed138a6a48`; no partial output remained. Without restarting the app, loaded the four-second valid clip plus tail and retried MP4 1080p/30: Saved, native walk 121 frames, independent ffprobe 120 decoded frames / 4.000 s at 1752×1080, full-file decode exit 0. This closes the publication-safety gap observed in the previous row; single-frame encoder timing itself remains unchanged. Native tests also cover absent/existing destination, malformed output, cancellation and successful H264/HEVC export. Recording, Presenter Overlay, unrelated editor features, Windows/Linux runtime and release packaging were not exercised. |
| 2026-10-24 | dev `fix/reject-empty-exports`, PR #1377 follow-up; rebuilt addon SHA256 `2ad4ce50da3e2e8dd2a6dc67017048d5ae515f5b0d7143d509d727c9d09c29da` | macOS 15.7.1, Apple Silicon | Partial — multiclip GUI export passed; single-frame muxing limit observed | Computer-use opened an isolated profile and a synthetic four-second clip followed by a 10 ms tail starting at 3.99 s. MP4 1080p/30 displayed Saved; native walk reported 121 frames, independent ffprobe decoded 120 frames / 4.000 s at 1752×1080, and full-file decode completed without errors. Tail alone produced one muxed video sample with zero video duration and no decoded video frames; this additional single-frame muxing case is unresolved and no baseline attribution is claimed. Initial native-path entry failed; selecting the prepared project in the file list worked. Native export/inspection tests separately: 7 passed, 1 existing macOS frame-count-probe stub failure. Recording, Presenter Overlay compatibility, other editor features, Windows/Linux runtime and release validation were not exercised. |