Merge pull request #1598 from CapSoftware/cursor/editor-playback-optimization-5f42

Editor playback optimization

Author: richiemcilroy

Cargo.lock

@@ -66,6 +66,7 @@ pub async fn create_camera_preview_ws() -> (Sender<FFmpegVideoFrame>, u16, Cance
                     stride: frame.stride(0) as u32,
                     frame_number: 0,
                     target_time_ns: 0,
+                    format: crate::frame_ws::WSFrameFormat::Rgba,
                     created_at: Instant::now(),
                 })
                 .ok();

apps/desktop/src-tauri/src/camera_legacy.rs

@@ -5,7 +5,7 @@ use tokio_util::sync::CancellationToken;
 
 use crate::{
     create_editor_instance_impl,
-    frame_ws::{WSFrame, create_watch_frame_ws},
+    frame_ws::{WSFrame, WSFrameFormat, create_watch_frame_ws},
 };
 
 pub struct EditorInstance {
@@ -27,16 +27,30 @@ async fn do_prewarm(app: AppHandle, path: PathBuf) -> PendingResult {
     let inner = create_editor_instance_impl(
         &app,
         path,
-        Box::new(move |frame| {
-            let _ = frame_tx.send(Some(WSFrame {
-                data: frame.data,
-                width: frame.width,
-                height: frame.height,
-                stride: frame.padded_bytes_per_row,
-                frame_number: frame.frame_number,
-                target_time_ns: frame.target_time_ns,
-                created_at: Instant::now(),
-            }));
+        Box::new(move |output| {
+            let ws_frame = match output {
+                cap_editor::EditorFrameOutput::Nv12(frame) => WSFrame {
+                    data: frame.data,
+                    width: frame.width,
+                    height: frame.height,
+                    stride: frame.y_stride,
+                    frame_number: frame.frame_number,
+                    target_time_ns: frame.target_time_ns,
+                    format: WSFrameFormat::Nv12,
+                    created_at: Instant::now(),
+                },
+                cap_editor::EditorFrameOutput::Rgba(frame) => WSFrame {
+                    data: frame.data,
+                    width: frame.width,
+                    height: frame.height,
+                    stride: frame.padded_bytes_per_row,
+                    frame_number: frame.frame_number,
+                    target_time_ns: frame.target_time_ns,
+                    format: WSFrameFormat::Rgba,
+                    created_at: Instant::now(),
+                },
+            };
+            let _ = frame_tx.send(Some(std::sync::Arc::new(ws_frame)));
         }),
     )
     .await?;
@@ -218,16 +232,30 @@ impl EditorInstances {
                 let inner = create_editor_instance_impl(
                     window.app_handle(),
                     path,
-                    Box::new(move |frame| {
-                        let _ = frame_tx.send(Some(WSFrame {
-                            data: frame.data,
-                            width: frame.width,
-                            height: frame.height,
-                            stride: frame.padded_bytes_per_row,
-                            frame_number: frame.frame_number,
-                            target_time_ns: frame.target_time_ns,
-                            created_at: Instant::now(),
-                        }));
+                    Box::new(move |output| {
+                        let ws_frame = match output {
+                            cap_editor::EditorFrameOutput::Nv12(frame) => WSFrame {
+                                data: frame.data,
+                                width: frame.width,
+                                height: frame.height,
+                                stride: frame.y_stride,
+                                frame_number: frame.frame_number,
+                                target_time_ns: frame.target_time_ns,
+                                format: WSFrameFormat::Nv12,
+                                created_at: Instant::now(),
+                            },
+                            cap_editor::EditorFrameOutput::Rgba(frame) => WSFrame {
+                                data: frame.data,
+                                width: frame.width,
+                                height: frame.height,
+                                stride: frame.padded_bytes_per_row,
+                                frame_number: frame.frame_number,
+                                target_time_ns: frame.target_time_ns,
+                                format: WSFrameFormat::Rgba,
+                                created_at: Instant::now(),
+                            },
+                        };
+                        let _ = frame_tx.send(Some(std::sync::Arc::new(ws_frame)));
                     }),
                 )
                 .await?;