Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
Merge pull request #2868 from CapSoftware/perf/rendering-backward-scrub-cache
Richie McIlroycea95bd5a556
diff --cc crates/rendering/src/decoder/avassetreader.rsindex a6077345d,9f2fda451..b3b1114e3--- a/crates/rendering/src/decoder/avassetreader.rs+++ b/crates/rendering/src/decoder/avassetreader.rs@@@ -1218,34 -1232,12 +1232,38 @@@ impl AVAssetReaderDecoder}decoder.is_done = true;++ // A failed reader (a decode error, seen with many decode+ // sessions on a loaded machine) vends nothing more, and the+ // newest cached frame is stale for every request still+ // waiting. Read them again from a fresh reader; when that one+ // fails too, leave them unanswered so the handle switches to+ // software decoding instead of showing an older frame.+ if !pending_requests.is_empty()+ && let Some(error) = decoder.inner.failure()+ {+ tracing::warn!(+ decoder_idx,+ requested_frame,+ %error,+ "Video reader failed; reading the requests again from a fresh reader"+ );+ retry_requests.extend(+ pending_requests+ .drain(..)+ .filter(|request| !request.retried)+ .map(|request| PendingRequest {+ retried: true,+ ..request+ }),+ );+ }}+ if abandoned {+ pending_requests.clear();+ }+for request in retry_requests.into_iter().rev() {deferred_requests.push_front(request);}diff --cc crates/rendering/src/decoder/model/mod.rsindex bc356361f,f2624ebd0..291012dbd--- a/crates/rendering/src/decoder/model/mod.rs+++ b/crates/rendering/src/decoder/model/mod.rs@@@ -1092,68 -1092,11 +1092,70 @@@ fn run_suite(decoder: Decoder)#[cfg(target_os = "macos")]#[test]fn avassetreader_answers_match_the_reference_model() {+ // Engine verify runs only this test of the module on macOS.+ avassetreader_answers_stay_exact_when_its_reader_fails();run_suite(Decoder::Avf);+ avassetreader_scrubbing_backwards_reuses_the_frames_below_each_seek();+ avassetreader_stops_reading_only_once_every_request_is_abandoned();}+/// A native reader can fail mid-stream with a decode error and vend nothing+/// more. Every later answer must still be the frame on screen: read from a+/// fresh reader, or from software decoding when that one fails too.+#[cfg(target_os = "macos")]+#[test]+fn avassetreader_answers_stay_exact_when_its_reader_fails() {+ let script = Script {+ time_base: (1, 30),+ frames: (0..120)+ .map(|pts| scripted::ScriptFrame {+ pts,+ keyframe: pts % 30 == 0,+ })+ .collect(),+ last_duration: 1,+ };+ let runtime = runtime();+ let patterns: [(&str, Vec<u32>, bool); 2] = [+ ("playback", (0..90).collect(), false),+ ("scrub", (0..112).step_by(7).collect(), true),+ ];+ for failed_reads in [1, 2] {+ for (pattern, frames, initial) in &patterns {+ let registration = scripted::register(script.clone());+ for _ in 0..failed_reads {+ registration.fail_avf_read_at(40);+ }+ let path = registration.path().to_path_buf();+ runtime.block_on(async {+ let handle = spawn_decoder("model", path, 30, 0.0, false)+ .await+ .unwrap()+ .with_max_fallback_distance(2);+ for &frame in frames {+ let time = frame as f32 / 30.0;+ let decoded = if *initial {+ handle.get_frame_initial(time).await+ } else {+ handle.get_frame(time).await+ };+ assert_eq!(+ decoded.as_ref().and_then(frame_identity),+ Some(frame),+ "{pattern} with {failed_reads} failed reads at sample 40: request {frame}"+ );+ }+ assert_eq!(+ handle.decoder_type() == DecoderType::AVAssetReader,+ failed_reads == 1,+ "{pattern} with {failed_reads} failed reads ended on {}",+ handle.decoder_type()+ );+ });+ }+ }+}+#[test]fn ffmpeg_answers_match_the_reference_model() {run_suite(Decoder::Ffmpeg);diff --cc crates/video-decode/src/scripted.rsindex 2e48c1bbe,864894c62..08e516f52--- a/crates/video-decode/src/scripted.rs+++ b/crates/video-decode/src/scripted.rs@@@ -97,8 -96,8 +98,9 @@@ struct Counterspub(crate) struct ScriptState {pub(crate) script: Script,counters: Counters,+ vend_delay_micros: AtomicU64,vended: Mutex<Vec<u32>>,+ failing_samples: Mutex<Vec<usize>>,#[cfg(target_os = "macos")]samples: Mutex<HashMap<usize, avf::SharedSample>>,}@@@ -204,8 -199,8 +219,9 @@@ pub fn register(script: Script) -> Regilet state = Arc::new(ScriptState {script,counters: Counters::default(),+ vend_delay_micros: AtomicU64::new(0),vended: Mutex::new(Vec::new()),+ failing_samples: Mutex::new(Vec::new()),#[cfg(target_os = "macos")]samples: Mutex::new(HashMap::new()),});