fmt

Author: richiemcilroy

crates/editor/src/playback.rs

@@ -10,8 +10,15 @@ use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
 };
 use futures::stream::{FuturesUnordered, StreamExt};
-use std::{collections::{HashSet, VecDeque}, sync::Arc, time::Duration};
-use tokio::{sync::{mpsc as tokio_mpsc, watch}, time::Instant};
+use std::{
+    collections::{HashSet, VecDeque},
+    sync::Arc,
+    time::Duration,
+};
+use tokio::{
+    sync::{mpsc as tokio_mpsc, watch},
+    time::Instant,
+};
 use tracing::{error, info, trace, warn};
 
 use crate::{
@@ -80,7 +87,8 @@ impl Playback {
             event_rx,
         };
 
-        let (prefetch_tx, mut prefetch_rx) = tokio_mpsc::channel::<PrefetchedFrame>(PREFETCH_BUFFER_SIZE * 2);
+        let (prefetch_tx, mut prefetch_rx) =
+            tokio_mpsc::channel::<PrefetchedFrame>(PREFETCH_BUFFER_SIZE * 2);
         let (frame_request_tx, mut frame_request_rx) = watch::channel(self.start_frame_number);
 
         let prefetch_stop_rx = stop_rx.clone();
@@ -113,20 +121,22 @@ impl Playback {
                 while in_flight.len() < PARALLEL_DECODE_TASKS {
                     let frame_num = next_prefetch_frame;
                     let prefetch_time = frame_num as f64 / fps_f64;
-                    
+
                     if prefetch_time >= prefetch_duration {
                         break;
                     }
-                    
+
                     if in_flight_frames.contains(&frame_num) {
                         next_prefetch_frame += 1;
                         continue;
                     }
 
                     let project = prefetch_project.borrow().clone();
-                    
+
                     if let Some((segment_time, segment)) = project.get_segment_time(prefetch_time) {
-                        if let Some(segment_media) = prefetch_segment_medias.get(segment.recording_clip as usize) {
+                        if let Some(segment_media) =
+                            prefetch_segment_medias.get(segment.recording_clip as usize)
+                        {
                             let clip_offsets = project
                                 .clips
                                 .iter()
@@ -137,9 +147,9 @@ impl Playback {
                             let decoders = segment_media.decoders.clone();
                             let hide_camera = project.camera.hide;
                             let segment_index = segment.recording_clip;
-                            
+
                             in_flight_frames.insert(frame_num);
-                            
+
                             in_flight.push(async move {
                                 let result = decoders
                                     .get_frames(segment_time as f32, !hide_camera, clip_offsets)
@@ -148,13 +158,13 @@ impl Playback {
                             });
                         }
                     }
-                    
+
                     next_prefetch_frame += 1;
                 }
 
                 tokio::select! {
                     biased;
-                    
+
                     Some((frame_num, segment_index, result)) = in_flight.next() => {
                         in_flight_frames.remove(&frame_num);
                         if let Some(segment_frames) = result {
@@ -165,7 +175,7 @@ impl Playback {
                             }).await;
                         }
                     }
-                    
+
                     _ = tokio::time::sleep(Duration::from_millis(1)), if in_flight.is_empty() => {}
                 }
             }
@@ -191,7 +201,8 @@ impl Playback {
 
             let frame_duration = Duration::from_secs_f64(1.0 / fps_f64);
             let mut frame_number = self.start_frame_number;
-            let mut prefetch_buffer: VecDeque<PrefetchedFrame> = VecDeque::with_capacity(PREFETCH_BUFFER_SIZE);
+            let mut prefetch_buffer: VecDeque<PrefetchedFrame> =
+                VecDeque::with_capacity(PREFETCH_BUFFER_SIZE);
             let max_frame_skip = 3u32;
 
             'playback: loop {
@@ -223,17 +234,22 @@ impl Playback {
 
                 let project = self.project.borrow().clone();
 
-                let prefetched_idx = prefetch_buffer.iter().position(|p| p.frame_number == frame_number);
-                
+                let prefetched_idx = prefetch_buffer
+                    .iter()
+                    .position(|p| p.frame_number == frame_number);
+
                 let segment_frames_opt = if let Some(idx) = prefetched_idx {
                     let prefetched = prefetch_buffer.remove(idx).unwrap();
                     Some((prefetched.segment_frames, prefetched.segment_index))
                 } else {
-                    let Some((segment_time, segment)) = project.get_segment_time(playback_time) else {
+                    let Some((segment_time, segment)) = project.get_segment_time(playback_time)
+                    else {
                         break;
                     };
 
-                    let Some(segment_media) = self.segment_medias.get(segment.recording_clip as usize) else {
+                    let Some(segment_media) =
+                        self.segment_medias.get(segment.recording_clip as usize)
+                    else {
                         frame_number = frame_number.saturating_add(1);
                         continue;
                     };
@@ -256,7 +272,8 @@ impl Playback {
                 };
 
                 if let Some((segment_frames, segment_index)) = segment_frames_opt {
-                    let Some(segment_media) = self.segment_medias.get(segment_index as usize) else {
+                    let Some(segment_media) = self.segment_medias.get(segment_index as usize)
+                    else {
                         frame_number = frame_number.saturating_add(1);
                         continue;
                     };
@@ -290,7 +307,10 @@ impl Playback {
                         trace!("Skipping {} frames to catch up", frames_behind);
                     } else {
                         frame_number = frame_number + max_frame_skip;
-                        trace!("Limiting frame skip to {} (was {} behind)", max_frame_skip, frames_behind);
+                        trace!(
+                            "Limiting frame skip to {} (was {} behind)",
+                            max_frame_skip, frames_behind
+                        );
                     }
 
                     prefetch_buffer.retain(|p| p.frame_number >= frame_number);