[*] update normally

Author: heng30

lib/recorder/examples/recording_5s_demo.rs

@@ -62,7 +62,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             while let Ok(frame) = rx.recv() {
                 log::debug!(
                     "frame_receiver_user frame len: {} bytes",
-                    frame.cb_data.data.pixel_data.len()
+                    frame.frame.cb_data.data.pixel_data.len()
                 );
             }
             log::debug!("exit frame_receiver_user");

lib/recorder/src/lib.rs

@@ -173,6 +173,18 @@ pub struct Frame {
     pub timestamp: Instant,
 }
 
+#[derive(Debug, Clone)]
+pub struct StatsUser {
+    pub total_frames: u64,
+    pub loss_frames: u64,
+}
+
+#[derive(Debug, Clone)]
+pub struct FrameUser {
+    pub stats: StatsUser,
+    pub frame: Frame,
+}
+
 /// Configuration for combining video and audio tracks into a final MP4 file.
 ///
 /// This structure is used by both the built-in and FFmpeg track combiners

lib/recorder/src/recorder.rs

@@ -1,7 +1,7 @@
 use crate::{
-    AudioError, AudioRecorder, CombineTracksConfig, EncodedFrame, Frame, H264Writer,
+    AudioError, AudioRecorder, CombineTracksConfig, EncodedFrame, Frame, FrameUser, H264Writer,
     MAX_H264_WRITER_QUEUE_SIZE, ProgressState, RecorderConfig, RecorderError, Resolution,
-    SpeakerRecorder, StreamingAudioRecorder, VideoEncoder, combine_tracks,
+    SpeakerRecorder, StatsUser, StreamingAudioRecorder, VideoEncoder, combine_tracks,
 };
 use capture::{Capture, CaptureIterConfig, capture_output_iter};
 use crossbeam::channel::{Receiver, Sender, bounded};
@@ -90,8 +90,8 @@ pub struct RecordingSession {
     frame_receiver: Receiver<Frame>,
     capture_workers: Vec<JoinHandle<()>>,
 
-    frame_sender_user: Option<Sender<Frame>>,
-    frame_receiver_user: Option<Arc<Receiver<Frame>>>,
+    frame_sender_user: Option<Sender<FrameUser>>,
+    frame_receiver_user: Option<Arc<Receiver<FrameUser>>>,
 
     stop_sig: Arc<AtomicBool>,
     stop_sig_combine: Arc<AtomicBool>,
@@ -356,10 +356,17 @@ impl RecordingSession {
                     self.total_frame_count += 1;
                     let index = frame.thread_id as usize;
 
-                    if let Some(ref sender) = self.frame_sender_user
-                        && let Err(e) = sender.try_send(frame.clone())
-                    {
-                        log::warn!("try send frame failed: {e}");
+                    if let Some(ref sender) = self.frame_sender_user {
+                        let frame_user = FrameUser {
+                            stats: StatsUser {
+                                total_frames: self.total_frame_count,
+                                loss_frames: self.loss_frame_count.load(Ordering::Relaxed),
+                            },
+                            frame: frame.clone(),
+                        };
+                        if let Err(e) = sender.try_send(frame_user) {
+                            log::warn!("try send frame failed: {e}");
+                        }
                     }
 
                     if let Err(e) = resize_sender.try_send((self.total_frame_count, frame)) {
@@ -1083,7 +1090,7 @@ impl RecordingSession {
     ///     }
     /// }
     /// ```
-    pub fn get_frame_receiver_user(&self) -> Option<Arc<Receiver<Frame>>> {
+    pub fn get_frame_receiver_user(&self) -> Option<Arc<Receiver<FrameUser>>> {
         self.frame_receiver_user.clone()
     }
 

wayshot/src/logic/recorder.rs

@@ -17,7 +17,9 @@ use recorder::{
     AudioRecorder, FPS, RecorderConfig, RecordingSession, Resolution, SpeakerRecorder,
     StreamingAudioRecorder, bounded,
 };
-use slint::{ComponentHandle, Model, SharedString, ToSharedString, VecModel, Weak};
+use slint::{
+    ComponentHandle, Model, SharedPixelBuffer, SharedString, ToSharedString, VecModel, Weak,
+};
 use std::{
     path::PathBuf,
     sync::{
@@ -442,13 +444,32 @@ fn inner_start_recording(ui_weak: Weak<AppWindow>) -> Result<()> {
     }
 
     let frame_receiver_user = session.get_frame_receiver_user();
+    let ui_weak_clone = ui_weak.clone();
     thread::spawn(move || {
         if let Some(rx) = frame_receiver_user {
             while let Ok(frame) = rx.recv() {
                 log::debug!(
                     "frame_receiver_user frame len: {} bytes",
-                    frame.cb_data.data.pixel_data.len()
+                    frame.frame.cb_data.data.pixel_data.len()
                 );
+
+                _ = ui_weak_clone.upgrade_in_event_loop(move |ui| {
+                    let buffer = SharedPixelBuffer::<slint::Rgba8Pixel>::clone_from_slice(
+                        &frame.frame.cb_data.data.pixel_data,
+                        frame.frame.cb_data.data.width,
+                        frame.frame.cb_data.data.height,
+                    );
+                    let img = slint::Image::from_rgba8(buffer);
+                    global_store!(ui).set_preview_image(img);
+
+                    // TODO: fps
+                    let mut sinfo = global_store!(ui).get_stats_info();
+                    sinfo.total = frame.stats.total_frames as i32;
+                    sinfo.loss = (frame.stats.loss_frames as f64 * 100.0
+                        / frame.stats.total_frames.max(1) as f64)
+                        as f32;
+                    global_store!(ui).set_stats_info(sinfo);
+                });
             }
             log::info!("exit frame_receiver_user");
         } else {

wayshot/ui/panel/desktop/home.slint

@@ -42,7 +42,7 @@ component PreviewPanel inherits Rectangle {
         height: stats-vbox.preferred-height;
         background: black;
         border-radius: Theme.border-radius;
-        opacity: 0.5;
+        opacity: 0.8;
 
         stats-vbox := VerticalLayout {
             spacing: Theme.spacing * 2;
@@ -332,7 +332,7 @@ component ControlPanel inherits HorizontalLayout {
                     }
 
                     ElevatedBtn {
-                        background: Theme.danger-color;
+                        background: self.has-hover ? Theme.danger-color.darker(30%) : Theme.danger-color;
                         icon: Icons.stop-light;
                         colorize: Theme.light-text-color;
 
@@ -343,8 +343,8 @@ component ControlPanel inherits HorizontalLayout {
                 }
 
                 if Store.record-status == RecordStatus.Stopped:  ElevatedBtn {
+                    background: self.has-hover ? Theme.thirdly-brand-color.darker(30%) : Theme.thirdly-brand-color;
                     icon: Icons.control-start-light;
-                    background: Theme.thirdly-brand-color;
                     colorize: Theme.light-text-color;
 
                     clicked => {
@@ -378,7 +378,7 @@ component ControlPanel inherits HorizontalLayout {
                 padding: Theme.padding * 4;
 
                 ElevatedBtn {
-                    background: Theme.warning-color;
+                    background: self.has-hover ? Theme.warning-color.darker(30%) : Theme.warning-color;
                     icon: Icons.stop-light;
                     colorize: Theme.light-text-color;