Refactor CameraLayer::prepare argument structure

Author: richiemcilroy

crates/rendering/src/layers/camera.rs

@@ -59,15 +59,24 @@ impl CameraLayer {
         &mut self,
         device: &wgpu::Device,
         queue: &wgpu::Queue,
-        data: Option<(CompositeVideoFrameUniforms, XY<u32>, &DecodedFrame, f32)>,
+        uniforms: Option<CompositeVideoFrameUniforms>,
+        frame_data: Option<(XY<u32>, &DecodedFrame, f32)>,
     ) {
-        self.hidden = data.is_none();
+        let Some(uniforms) = uniforms else {
+            self.hidden = true;
+            return;
+        };
 
-        let Some((uniforms, frame_size, camera_frame, recording_time)) = data else {
+        let has_previous_frame = self.last_recording_time.is_some();
+        self.hidden = frame_data.is_none() && !has_previous_frame;
+
+        queue.write_buffer(&self.uniforms_buffer, 0, bytemuck::cast_slice(&[uniforms]));
+
+        let Some((frame_size, camera_frame, recording_time)) = frame_data else {
             return;
         };
 
-        let frame_data = camera_frame.data();
+        let frame_data_bytes = camera_frame.data();
         let format = camera_frame.format();
 
         let is_same_frame = self
@@ -107,7 +116,7 @@ impl CameraLayer {
                             origin: wgpu::Origin3d::ZERO,
                             aspect: wgpu::TextureAspect::All,
                         },
-                        frame_data,
+                        frame_data_bytes,
                         wgpu::TexelCopyBufferLayout {
                             offset: 0,
                             bytes_per_row: Some(src_bytes_per_row),
@@ -197,8 +206,6 @@ impl CameraLayer {
             self.last_recording_time = Some(recording_time);
             self.current_texture = next_texture;
         }
-
-        queue.write_buffer(&self.uniforms_buffer, 0, bytemuck::cast_slice(&[uniforms]));
     }
 
     fn copy_from_yuv_output(

crates/rendering/src/lib.rs

@@ -1694,27 +1694,25 @@ impl RendererLayers {
         self.camera.prepare(
             &constants.device,
             &constants.queue,
-            (|| {
-                Some((
-                    uniforms.camera?,
-                    constants.options.camera_size?,
-                    segment_frames.camera_frame.as_ref()?,
-                    segment_frames.recording_time,
-                ))
-            })(),
+            uniforms.camera,
+            constants.options.camera_size.and_then(|size| {
+                segment_frames
+                    .camera_frame
+                    .as_ref()
+                    .map(|frame| (size, frame, segment_frames.recording_time))
+            }),
         );
 
         self.camera_only.prepare(
             &constants.device,
             &constants.queue,
-            (|| {
-                Some((
-                    uniforms.camera_only?,
-                    constants.options.camera_size?,
-                    segment_frames.camera_frame.as_ref()?,
-                    segment_frames.recording_time,
-                ))
-            })(),
+            uniforms.camera_only,
+            constants.options.camera_size.and_then(|size| {
+                segment_frames
+                    .camera_frame
+                    .as_ref()
+                    .map(|frame| (size, frame, segment_frames.recording_time))
+            }),
         );
 
         self.text.prepare(