fmt

Author: richiemcilroy

apps/desktop/src/utils/tauri.ts

@@ -477,7 +477,7 @@ export type ProjectConfiguration = { aspectRatio: AspectRatio | null; background
 export type ProjectRecordingsMeta = { segments: SegmentRecordings[] }
 export type RecordingAction = "Started" | "InvalidAuthentication" | "UpgradeRequired"
 export type RecordingDeleted = { path: string }
-export type RecordingEvent = { variant: "Countdown"; value: number } | { variant: "Started" } | { variant: "Stopped" } | { variant: "Failed"; error: string } | { variant: "InputLost"; input: RecordingInputKind } | { variant: "InputRestored"; input: RecordingInputKind } | { variant: "DiskSpaceLow"; available_mb: number; threshold_mb: number; path: string }
+export type RecordingEvent = { variant: "Countdown"; value: number } | { variant: "Started" } | { variant: "Stopped" } | { variant: "Failed"; error: string } | { variant: "InputLost"; input: RecordingInputKind } | { variant: "InputRestored"; input: RecordingInputKind }
 export type RecordingInputKind = "microphone" | "camera"
 export type RecordingMeta = (StudioRecordingMeta | InstantRecordingMeta) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null; upload?: UploadMeta | null }
 export type RecordingMetaWithMetadata = ((StudioRecordingMeta | InstantRecordingMeta) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null; upload?: UploadMeta | null }) & { mode: RecordingMode; status: StudioRecordingStatus }

crates/rendering/src/decoder/avassetreader.rs

@@ -6,8 +6,6 @@ use std::{
     sync::{Arc, mpsc},
 };
 
-use tracing::debug;
-
 use cidre::{
     arc::R,
     cv::{self, pixel_buffer::LockFlags},
@@ -593,16 +591,20 @@ impl AVAssetReaderDecoder {
                                     *last_sent_frame.borrow_mut() = Some(data.clone());
                                     let _ = req.sender.send(data.to_decoded_frame());
                                 } else {
-                                    let data = if is_scrubbing {
-                                        cache_frame.data().clone()
-                                    } else {
-                                        last_sent_frame
-                                            .borrow()
-                                            .clone()
-                                            .unwrap_or_else(|| cache_frame.data().clone())
-                                    };
-                                    *last_sent_frame.borrow_mut() = Some(data.clone());
-                                    let _ = req.sender.send(data.to_decoded_frame());
+                                    const MAX_FALLBACK_DISTANCE: u32 = 10;
+
+                                    let nearest = cache
+                                        .range(..=req.frame)
+                                        .next_back()
+                                        .or_else(|| cache.range(req.frame..).next());
+
+                                    if let Some((&frame_num, cached)) = nearest {
+                                        let distance = req.frame.abs_diff(frame_num);
+                                        if distance <= MAX_FALLBACK_DISTANCE {
+                                            let _ =
+                                                req.sender.send(cached.data().to_decoded_frame());
+                                        }
+                                    }
                                 }
                             } else {
                                 remaining_requests.push(req);
@@ -635,16 +637,20 @@ impl AVAssetReaderDecoder {
                 if let Some(cached) = cache.get(&req.frame) {
                     let data = cached.data().clone();
                     let _ = req.sender.send(data.to_decoded_frame());
-                } else if let Some(last) = last_sent_frame.borrow().clone() {
-                    if req.sender.send(last.to_decoded_frame()).is_err() {}
-                } else if let Some(first) = first_ever_frame.borrow().clone() {
-                    if req.sender.send(first.to_decoded_frame()).is_err() {}
                 } else {
-                    debug!(
-                        decoder = _name,
-                        requested_frame = req.frame,
-                        "No frame available to send - request dropped"
-                    );
+                    const MAX_FALLBACK_DISTANCE: u32 = 10;
+
+                    let nearest = cache
+                        .range(..=req.frame)
+                        .next_back()
+                        .or_else(|| cache.range(req.frame..).next());
+
+                    if let Some((&frame_num, cached)) = nearest {
+                        let distance = req.frame.abs_diff(frame_num);
+                        if distance <= MAX_FALLBACK_DISTANCE {
+                            let _ = req.sender.send(cached.data().to_decoded_frame());
+                        }
+                    }
                 }
             }
         }