Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(recording): keep the recorded display fps when finalizing a Studio recording

Richie McIlroya188fa33b2c0
diff --git a/crates/enc-ffmpeg/src/remux.rs b/crates/enc-ffmpeg/src/remux.rs
index 984dc93e3..fa5810d4a 100644
--- a/crates/enc-ffmpeg/src/remux.rs
+++ b/crates/enc-ffmpeg/src/remux.rs
@@ -750,6 +750,25 @@ fn get_media_duration_inner(path: &Path) -> Option<Duration> {
Some(Duration::from_micros(duration_ts as u64))
}
+/// The stream's base frame rate (`r_frame_rate`): the rate every timestamp of
+/// a variable-rate track sits on, unlike `get_video_fps`'s average, which a
+/// mostly static screen recording pulls far below its capture rate.
+pub fn get_video_base_fps(path: &Path) -> Option<u32> {
+ suppress_ffmpeg_logs();
+ let result = (|| {
+ let input = avformat::input(path).ok()?;
+ let stream = input.streams().best(ffmpeg::media::Type::Video)?;
+ let rate = stream.rate();
+ if rate.numerator() <= 0 || rate.denominator() <= 0 {
+ return None;
+ }
+ let fps = (rate.numerator() as f64 / rate.denominator() as f64).round() as u32;
+ (1..=240).contains(&fps).then_some(fps)
+ })();
+ restore_ffmpeg_logs();
+ result
+}
+
pub fn get_video_fps(path: &Path) -> Option<u32> {
suppress_ffmpeg_logs();
let result = get_video_fps_inner(path);
diff --git a/crates/recording/src/recovery.rs b/crates/recording/src/recovery.rs
index 3d1e70f67..a1650c1f3 100644
--- a/crates/recording/src/recovery.rs
+++ b/crates/recording/src/recovery.rs
@@ -9,7 +9,7 @@ use cap_enc_ffmpeg::fragmented_mp4::{read_fragment_prefix, tail_is_complete};
use cap_enc_ffmpeg::remux::{
concatenate_audio_to_ogg, concatenate_m4s_segments_with_init,
concatenate_m4s_segments_with_init_validated, concatenate_video_fragments, get_media_duration,
- get_video_fps, merge_video_audio, probe_media_valid, probe_video_can_decode,
+ get_video_base_fps, merge_video_audio, probe_media_valid, probe_video_can_decode,
probe_video_seek_points, remux_file,
};
use cap_project::{
@@ -2529,7 +2529,15 @@ impl RecoveryManager {
original_segments.and_then(|segs| segs.get(segment_index as usize));
let display_path = segment_dir.join("display.mp4");
- let fps = get_video_fps(&display_path).unwrap_or(30);
+ // Decoders number frames on this rate. The file's average rate
+ // is far lower for a mostly static screen (11 fps for a 120 fps
+ // capture), and on that coarse grid playback and export drop
+ // every picture shorter than one step.
+ let fps = original_segment
+ .map(|s| s.display.fps)
+ .filter(|fps| *fps > 0)
+ .or_else(|| get_video_base_fps(&display_path))
+ .unwrap_or(30);
let cursor_path = segment_dir.join("cursor.json");
let keyboard_path = {
@@ -4913,6 +4921,30 @@ mod clean_studio_snapshot_tests {
assert!(RecoveryLock::acquire(project).is_ok());
}
+ #[test]
+ fn studio_finalization_keeps_the_recorded_display_fps() {
+ let directory = playable_studio_project(StudioRecordingStatus::NeedsRemux);
+ let project = directory.path();
+ let mut meta = RecordingMeta::load_for_project(project).unwrap();
+ let RecordingMetaInner::Studio(studio) = &mut meta.inner else {
+ panic!()
+ };
+ let StudioRecordingMeta::MultipleSegments { inner } = studio.as_mut() else {
+ panic!()
+ };
+ inner.segments[0].display.fps = 120;
+ meta.save_for_project().unwrap();
+
+ assert!(RecoveryManager::remux_if_needed(project).unwrap());
+ let meta = RecordingMeta::load_for_project(project).unwrap();
+ let StudioRecordingMeta::MultipleSegments { inner } = meta.studio_meta().unwrap() else {
+ panic!()
+ };
+ let display = meta.path(&inner.segments[0].display.path);
+ assert_ne!(cap_enc_ffmpeg::remux::get_video_fps(&display), Some(120));
+ assert_eq!(inner.segments[0].display.fps, 120);
+ }
+
#[test]
fn studio_finalization_preserves_encoded_audio_samples_and_offsets() {
let directory = playable_studio_project(StudioRecordingStatus::NeedsRemux);