[*] update normally

Author: heng30

lib/recorder/examples/recording_5s_demo.rs

@@ -34,7 +34,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     .with_enable_frame_channel_user(true)
     .with_enable_audio_channel_user(true)
     .with_enable_speaker_channel_user(true)
-    // .with_enable_preview_mode(true)
+    // .with_disable_save_file(true)
     .with_audio_device_name(Some(default_input.name))
     .with_enable_recording_speaker(true)
     .with_resolution(recorder::Resolution::Original((

lib/recorder/src/lib.rs

@@ -174,7 +174,7 @@ pub struct StatsUser {
 #[derive(Debug, Clone)]
 pub struct FrameUser {
     pub stats: StatsUser,
-    pub frame: Frame,
+    pub frame: Option<Frame>,
 }
 
 /// Configuration for combining video and audio tracks into a final MP4 file.

lib/recorder/src/record_audio.rs

@@ -504,11 +504,11 @@ impl StreamingAudioRecorder {
         recorder: AudioRecorder,
         device_name: &str,
         file_path: P,
-        enable_preview_mode: bool,
+        disable_save_file: bool,
     ) -> Result<Self, AudioError> {
         let config = recorder.get_config();
 
-        let file_writer = if enable_preview_mode {
+        let file_writer = if disable_save_file {
             Arc::new(Mutex::new(None))
         } else {
             Arc::new(Mutex::new(Some(AudioFileWriter::new(

lib/recorder/src/record_speaker.rs

@@ -117,7 +117,7 @@ pub struct SpeakerRecorder {
     /// Optional sender for audio level data (if monitoring enabled)
     level_sender: Option<Arc<Sender<f32>>>,
     /// Whether to run in preview mode (no file output)
-    enable_preview_mode: bool,
+    disable_save_file: bool,
 
     // [0, infinity]
     amplification: Option<Arc<AtomicI32>>,
@@ -134,7 +134,7 @@ impl SpeakerRecorder {
     /// * `save_path` - Path where the WAV file will be saved
     /// * `stop_sig` - Atomic boolean signal to stop recording
     /// * `level_sender` - Optional sender for audio level monitoring
-    /// * `enable_preview_mode` - If true, no file will be written
+    /// * `disable_save_file` - If true, no file will be written
     ///
     /// # Returns
     ///
@@ -154,7 +154,7 @@ impl SpeakerRecorder {
         save_path: PathBuf,
         stop_sig: Arc<AtomicBool>,
         level_sender: Option<Arc<Sender<f32>>>,
-        enable_preview_mode: bool,
+        disable_save_file: bool,
     ) -> Result<Self, SpeakerError> {
         pipewire::init();
 
@@ -172,7 +172,7 @@ impl SpeakerRecorder {
             save_path,
             stop_sig,
             level_sender,
-            enable_preview_mode,
+            disable_save_file,
             amplification: None,
         })
     }
@@ -220,7 +220,7 @@ impl SpeakerRecorder {
             node_id
         );
 
-        let writer = if self.enable_preview_mode {
+        let writer = if self.disable_save_file {
             Arc::new(Mutex::new(None))
         } else {
             let spec = hound::WavSpec {
@@ -255,7 +255,7 @@ impl SpeakerRecorder {
 
         session.stop_recording()?;
 
-        if !self.enable_preview_mode {
+        if !self.disable_save_file {
             log::info!(
                 "Successfully save speaker file: {}",
                 self.save_path.display()

lib/recorder/src/recorder.rs

@@ -341,7 +341,7 @@ impl RecordingSession {
             self.config.screen_logical_size.width as u32,
             self.config.screen_logical_size.height as u32,
         );
-        let h264_writer = if self.config.enable_preview_mode {
+        let h264_writer = if self.config.disable_save_file {
             None
         } else {
             Some(H264Writer::new(
@@ -363,6 +363,10 @@ impl RecordingSession {
         loop {
             match encoder_receiver.recv() {
                 Ok((total_frame_index, img)) => {
+                    if self.config.disable_save_file {
+                        continue;
+                    }
+
                     let now = std::time::Instant::now();
                     match video_encoder.encode_frame(img.into()) {
                         Ok(EncodedFrame::Frame((_, encoded_frame))) => {
@@ -429,7 +433,7 @@ impl RecordingSession {
             audio_recorder,
             device_name,
             audio_file_path,
-            self.config.enable_preview_mode,
+            self.config.disable_save_file,
         )
         .map_err(|e: AudioError| RecorderError::AudioError(e.to_string()))?;
 
@@ -453,9 +457,9 @@ impl RecordingSession {
         };
 
         let amplification = self.config.speaker_amplification.clone();
-        let enable_preview_mode = self.config.enable_preview_mode;
+        let disable_save_file = self.config.disable_save_file;
         let handle = thread::spawn(move || {
-            let recorder = SpeakerRecorder::new(save_path, stop_sig, sender, enable_preview_mode)
+            let recorder = SpeakerRecorder::new(save_path, stop_sig, sender, disable_save_file)
                 .map_err(|e| RecorderError::SpeakerError(e.to_string()))?;
 
             let recorder = if amplification.is_some() {
@@ -485,7 +489,7 @@ impl RecordingSession {
         resolution: Resolution,
         total_frame_count: Arc<AtomicU64>,
         loss_frame_count: Arc<AtomicU64>,
-        enable_previwe_model: bool,
+        enable_preview_mode: bool,
     ) -> Vec<JoinHandle<()>> {
         let mut thread_handles = vec![];
         let (collect_sender, collect_receiver) = bounded(ENCODER_WORKER_CHANNEL_SIZE);
@@ -503,7 +507,6 @@ impl RecordingSession {
             collect_receiver,
             encoder_sender,
             loss_frame_count.clone(),
-            enable_previwe_model,
         ));
 
         thread_handles.push(Self::resize_forward_worker(
@@ -513,6 +516,7 @@ impl RecordingSession {
             start_time,
             total_frame_count,
             loss_frame_count,
+            enable_preview_mode,
         ));
 
         thread_handles
@@ -574,7 +578,6 @@ impl RecordingSession {
         collect_receiver: Receiver<(usize, u64, ResizedImageBuffer)>,
         encoder_sender: Sender<EncoderChannelData>,
         loss_frame_count: Arc<AtomicU64>,
-        enable_previwe_model: bool,
     ) -> JoinHandle<()> {
         let loss_frame_count_clone = loss_frame_count.clone();
         let handle = thread::spawn(move || {
@@ -585,10 +588,6 @@ impl RecordingSession {
             loop {
                 match collect_receiver.recv() {
                     Ok((thread_index, total_frame_index, img)) => {
-                        if enable_previwe_model {
-                            continue;
-                        }
-
                         // log::debug!("+++ {total_frame_index} - {expect_total_frame_index}");
                         if expect_total_frame_index == total_frame_index {
                             disorder_frame_counts = 0;
@@ -671,6 +670,7 @@ impl RecordingSession {
         start_time: Instant,
         total_frame_count: Arc<AtomicU64>,
         loss_frame_count: Arc<AtomicU64>,
+        enable_preview_mode: bool,
     ) -> JoinHandle<()> {
         let mut fps_counter = SimpleFpsCounter::new();
 
@@ -701,7 +701,12 @@ impl RecordingSession {
                                     total_frames: total_frame_count,
                                     loss_frames: loss_frame_count.load(Ordering::Relaxed),
                                 },
-                                frame: frame.clone(),
+
+                                frame: if enable_preview_mode {
+                                    Some(frame.clone())
+                                } else {
+                                    None
+                                },
                             };
                             if let Err(e) = sender.try_send(frame_user) {
                                 log::warn!("try send frame to user frame channel failed: {e}");
@@ -752,7 +757,7 @@ impl RecordingSession {
             if let Err(e) = audio_recorder.stop() {
                 log::warn!("Failed to stop audio recording: {}", e);
             } else {
-                if !self.config.enable_preview_mode {
+                if !self.config.disable_save_file {
                     log::info!(
                         "Successfully save audio recorder file: {}",
                         self.config
@@ -810,7 +815,7 @@ impl RecordingSession {
             writer.finish()?;
         }
 
-        if !self.config.enable_preview_mode {
+        if !self.config.disable_save_file {
             let tmp_output_file = self
                 .config
                 .output_path

lib/recorder/src/recorder_config.rs

@@ -133,6 +133,8 @@ pub struct RecorderConfig {
     /// Enable preview mode (process frames without writing to file)
     pub enable_preview_mode: bool,
 
+    pub disable_save_file: bool,
+
     #[setters(strip_option)]
     pub audio_amplification: Option<Arc<AtomicI32>>,
 
@@ -190,6 +192,7 @@ impl RecorderConfig {
             enable_audio_channel_user: false,
             enable_speaker_channel_user: false,
             enable_preview_mode: false,
+            disable_save_file: false,
             audio_amplification: None,
             speaker_amplification: None,
         }

wayshot/src/logic/recorder.rs

@@ -495,7 +495,8 @@ fn inner_start_recording(ui_weak: Weak<AppWindow>) -> Result<()> {
         screen_info.logical_size.clone(),
         RecorderConfig::make_filename(&all_config.recorder.save_dir),
     )
-    .with_enable_frame_channel_user(all_config.recorder.enable_preview)
+    .with_enable_frame_channel_user(true)
+    .with_enable_preview_mode(all_config.recorder.enable_preview)
     .with_enable_recording_speaker(all_config.control.enable_desktop_speaker)
     .with_include_cursor(all_config.recorder.include_cursor)
     .with_remove_cache_files(all_config.recorder.remove_temporary_files)
@@ -532,19 +533,23 @@ fn inner_start_recording(ui_weak: Weak<AppWindow>) -> Result<()> {
     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.frame.cb_data.data.pixel_data.len()
-                );
+                if let Some(ref frame) = frame.frame {
+                    log::debug!(
+                        "frame_receiver_user frame len: {} bytes",
+                        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);
+                    if let Some(ref frame) = frame.frame {
+                        let buffer = SharedPixelBuffer::<slint::Rgba8Pixel>::clone_from_slice(
+                            &frame.cb_data.data.pixel_data,
+                            frame.cb_data.data.width,
+                            frame.cb_data.data.height,
+                        );
+                        let img = slint::Image::from_rgba8(buffer);
+                        global_store!(ui).set_preview_image(img);
+                    }
 
                     let mut sinfo = global_store!(ui).get_stats_info();
                     sinfo.fps = frame.stats.fps;