Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Merge main into fix/recovery-exfat-appledouble

Richie McIlroy7cea9d0234f2
diff --cc crates/video-decode/src/ffmpeg.rs
index 1a97516cb,de0462f37..e7d94ce15
--- a/crates/video-decode/src/ffmpeg.rs
+++ b/crates/video-decode/src/ffmpeg.rs
@@@ -567,27 -623,36 +630,57 @@@ mod tests
}
}
+ #[test]
+ fn fragmented_decoder_skips_apple_double_sidecars() {
+ let directory = tempfile::tempdir().unwrap();
+ let source = directory.path().join("segments");
+ encode_segments(&source);
+ let expected = frames(&mut FFmpegDecoder::new(&source, None).unwrap());
+ let fragments = std::fs::read_dir(&source)
+ .unwrap()
+ .map(|entry| entry.unwrap().file_name())
+ .filter(|name| name.to_string_lossy().ends_with(".m4s"))
+ .collect::<Vec<_>>();
+ for name in fragments {
+ let sidecar = format!("._{}", name.to_string_lossy());
+ std::fs::write(source.join(sidecar), b"\x00\x05\x16\x07").unwrap();
+ }
+ assert_eq!(
+ frames(&mut FFmpegDecoder::new(&source, None).unwrap()),
+ expected
+ );
+ }
+
+ #[test]
+ fn software_decoder_opens_with_frame_threads() {
+ let directory = tempfile::tempdir().unwrap();
+ let source = directory.path().join("segments");
+ encode_segments(&source);
+ // MediaCodec never exists on desktop, so with hardware-capable limits
+ // it exercises the failed hardware fallback.
+ for hw_device_type in [None, Some(AVHWDeviceType::AV_HWDEVICE_TYPE_MEDIACODEC)] {
+ let input = DecoderInput::Segmented(open_fragmented_input(&source).unwrap());
+ let decoder =
+ FFmpegDecoder::from_input(input, hw_device_type, &HwDecoderCapabilities::default())
+ .unwrap();
+ assert!(decoder.hw_device.is_none());
+ let context = unsafe { &*decoder.decoder.as_ptr() };
+ assert!(context.thread_count >= 2);
+ assert_ne!(context.active_thread_type & ffmpeg::sys::FF_THREAD_FRAME, 0);
+ }
+ }
+
+ #[test]
+ fn threaded_decoder_drains_every_frame_at_end_of_input() {
+ let directory = tempfile::tempdir().unwrap();
+ let source = directory.path().join("segments");
+ encode_segments(&source);
+ let mut decoder = FFmpegDecoder::new(&source, None).unwrap();
+ assert_eq!(frames(&mut decoder).len(), 120);
+ decoder.reset(0.0).unwrap();
+ assert_eq!(frames(&mut decoder).len(), 120);
+ }
+
#[test]
fn relocatable_decoder_preserves_live_frames_and_seeks_after_publication() {
let directory = tempfile::tempdir().unwrap();