@@ -133,30 +133,29 @@ impl Playback {
133133
134134 let project = prefetch_project. borrow ( ) . clone ( ) ;
135135
136- if let Some ( ( segment_time, segment) ) = project. get_segment_time ( prefetch_time) {
137- if let Some ( segment_media) =
136+ if let Some ( ( segment_time, segment) ) = project. get_segment_time ( prefetch_time)
137+ && let Some ( segment_media) =
138138 prefetch_segment_medias. get ( segment. recording_clip as usize )
139- {
140- let clip_offsets = project
141- . clips
142- . iter ( )
143- . find ( |v| v. index == segment. recording_clip )
144- . map ( |v| v. offsets )
145- . unwrap_or_default ( ) ;
146-
147- let decoders = segment_media. decoders . clone ( ) ;
148- let hide_camera = project. camera . hide ;
149- let segment_index = segment. recording_clip ;
150-
151- in_flight_frames. insert ( frame_num) ;
152-
153- in_flight. push ( async move {
154- let result = decoders
155- . get_frames ( segment_time as f32 , !hide_camera, clip_offsets)
156- . await ;
157- ( frame_num, segment_index, result)
158- } ) ;
159- }
139+ {
140+ let clip_offsets = project
141+ . clips
142+ . iter ( )
143+ . find ( |v| v. index == segment. recording_clip )
144+ . map ( |v| v. offsets )
145+ . unwrap_or_default ( ) ;
146+
147+ let decoders = segment_media. decoders . clone ( ) ;
148+ let hide_camera = project. camera . hide ;
149+ let segment_index = segment. recording_clip ;
150+
151+ in_flight_frames. insert ( frame_num) ;
152+
153+ in_flight. push ( async move {
154+ let result = decoders
155+ . get_frames ( segment_time as f32 , !hide_camera, clip_offsets)
156+ . await ;
157+ ( frame_num, segment_index, result)
158+ } ) ;
160159 }
161160
162161 next_prefetch_frame += 1 ;
@@ -306,7 +305,7 @@ impl Playback {
306305 frame_number = expected_frame;
307306 trace ! ( "Skipping {} frames to catch up" , frames_behind) ;
308307 } else {
309- frame_number = frame_number + max_frame_skip;
308+ frame_number += max_frame_skip;
310309 trace ! (
311310 "Limiting frame skip to {} (was {} behind)" ,
312311 max_frame_skip, frames_behind
0 commit comments