Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

Merge remote-tracking branch 'origin/main' into perf/mf-decoder-state-machine

Marcos Daniel Rivera Gonzalezad4041dce39b
diff --cc crates/rendering/src/decoder/media_foundation.rs
index 562754e44,9eed68256..6d7700100
--- a/crates/rendering/src/decoder/media_foundation.rs
+++ b/crates/rendering/src/decoder/media_foundation.rs
@@@ -240,61 -243,38 +240,61 @@@ impl MFDecoder
};
let _ = ready_tx.send(Ok(init_result));
- struct PendingRequest {
- frame: u32,
- time: f32,
- sender: oneshot::Sender<DecodedFrame>,
- }
-
- while let Ok(r) = rx.recv() {
- let mut pending_requests: Vec<PendingRequest> = Vec::with_capacity(8);
+ let pixel_count = (video_width as u64) * (video_height as u64);
+ let readahead_frames = if pixel_count > 4_000_000 {
+ 8
+ } else if pixel_count > 2_000_000 {
+ 15
+ } else {
+ 30
+ };
+ let mut requests = FrameRequests::new(readahead_frames);
+ let answer = |sender: oneshot::Sender<DecodedFrame>, frame: Option<CachedFrame>| {
+ let _ = sender.send(frame.map_or_else(
+ || {
+ DecodedFrame::new(
+ vec![0u8; (video_width * video_height * 4) as usize],
+ video_width,
+ video_height,
+ )
+ },
+ |frame| frame.to_decoded_frame().with_matrix(matrix),
+ ));
+ };
- let mut push_request =
- |requested_time: f32, sender: oneshot::Sender<DecodedFrame>| {
- if sender.is_closed() {
- return;
- }
- let frame = super::request_frame(requested_time, fps);
- pending_requests.push(PendingRequest {
- frame,
- time: requested_time,
- sender,
- });
+ loop {
+ loop {
+ let message = match requests.next_step() {
+ Step::Wait => rx.recv().ok(),
+ _ => match rx.try_recv() {
+ Err(mpsc::TryRecvError::Empty) => break,
+ message => message.ok(),
+ },
};
-
- match r {
- VideoDecoderMessage::GetFrame(requested_time, _, sender) => {
- push_request(requested_time, sender);
+ // Each request borrows a decoder handle, which owns the sender, so once the
+ // channel is gone nobody is waiting for an answer.
+ let Some(message) = message else {
+ return;
+ };
+ let VideoDecoderMessage::GetFrame(time, _, sender) = message;
+ if sender.is_closed() {
+ continue;
}
- }
- let frame = (time * fps as f32).floor() as u32;
- while let Ok(msg) = rx.try_recv() {
- match msg {
- VideoDecoderMessage::GetFrame(requested_time, _, sender) => {
- push_request(requested_time, sender);
++ let frame = super::request_frame(time, fps);
+ match requests.request(frame, sender) {
+ Some((sender, cached)) => answer(sender, cached),
+ None => {
+ health.record_request();
+ if health.should_warn_unhealthy() {
+ warn!(
+ name = name,
+ consecutive_errors = health.consecutive_errors,
+ texture_failures = health.consecutive_texture_read_failures,
+ total_decoded = health.total_frames_decoded,
+ "MediaFoundation decoder unhealthy, performance may degrade"
+ );
+ }
}
}
}