[*] refactor: video-editor

Author: heng30

lib/video-editor/src/preview/renderer.rs

@@ -191,7 +191,7 @@ impl PreviewRenderer {
                             SamplesBuffer::new(channels, sample_rate, audio.samples.clone());
                         sink.append(source);
 
-                        if sink.is_paused() {
+                        if sink.is_paused() && self.controller.state() == PlaybackState::Playing {
                             sink.play();
                         }
                     }
@@ -229,6 +229,11 @@ impl PreviewRenderer {
             } else {
                 self.controller.pause();
                 self.mixer_iter = None;
+                if let Some(sink) = &self.audio_sink
+                    && let Ok(sink) = sink.lock()
+                {
+                    sink.pause();
+                }
             }
         }
 
@@ -245,6 +250,7 @@ impl PreviewRenderer {
         })?;
 
         let sink = AudioSink::connect_new(&device_sink.mixer());
+        sink.set_volume(self.controller.volume());
 
         self.audio_stream = Some(device_sink);
         self.audio_sink = Some(Arc::new(Mutex::new(sink)));
@@ -291,6 +297,7 @@ impl PreviewRenderer {
             && let Ok(sink) = sink.lock()
             && sink.is_paused()
         {
+            sink.set_volume(self.controller.volume());
             sink.play();
         }
 
@@ -335,6 +342,27 @@ impl PreviewRenderer {
         self.db_level_cache_left.clear();
         self.db_level_cache_right.clear();
         self.advance_frame()?;
+
+        // 如果无法获取帧（例如在轨道末尾），尝试向前回退获取前一帧
+        if self.current_frame.is_none() {
+            let frame_duration = Duration::from_secs_f64(1.0 / self.config.frame_rate());
+            for offset in 1..10 {
+                let fallback_position = position.saturating_sub(frame_duration * offset);
+                if fallback_position.is_zero() && offset > 1 {
+                    break;
+                }
+
+                self.controller.set_position(fallback_position);
+                self.mixer_iter = None;
+                self.advance_frame()?;
+
+                if self.current_frame.is_some() {
+                    self.controller.set_position(position); // 成功获取帧后，恢复原始位置
+                    break;
+                }
+            }
+        }
+
         Ok(())
     }
 
@@ -375,7 +403,7 @@ impl PreviewRenderer {
                             SamplesBuffer::new(channels, sample_rate, audio.samples.clone());
                         sink.append(source);
 
-                        if sink.is_paused() {
+                        if sink.is_paused() && self.controller.state() == PlaybackState::Playing {
                             sink.play();
                         }
                     }
@@ -398,6 +426,11 @@ impl PreviewRenderer {
             } else {
                 self.controller.pause();
                 self.mixer_iter = None;
+                if let Some(sink) = &self.audio_sink
+                    && let Ok(sink) = sink.lock()
+                {
+                    sink.pause();
+                }
             }
         }
 

lib/video-editor/src/tracks/audio_track.rs

@@ -163,7 +163,7 @@ impl UnifiedAudioTracksMixerIterator {
                 "max_cache_duration must be greater than cache_duration".into(),
             ));
         }
-        if timeline_offset >= end_timeline_offset {
+        if timeline_offset > end_timeline_offset {
             return Err(Error::InvalidConfig(
                 "timeline_offset must be less than end_timeline_offset".into(),
             ));

todo.md

@@ -1,6 +1,4 @@
 ## 问题
-5. 点击跳转到最后按钮没有刷新预览图片
-20. 视频已经暂停了，但是点击时间轴跳转的时候，会播放1秒左右的音频
 
 ## 待验证
 

wayshot/src/logic/popup_action.rs

@@ -136,16 +136,16 @@ pub fn init(ui: &AppWindow) {
                     let index = user_data.parse::<i32>().unwrap();
                     global_logic!(ui).invoke_video_editor_export_queue_remove(index);
                 }
-                "video-editor-add-empyt-video-track" => {
+                "video-editor-add-empty-video-track" => {
                     global_logic!(ui).invoke_video_editor_add_empty_video_track();
                 }
-                "video-editor-add-empyt-audio-track" => {
+                "video-editor-add-empty-audio-track" => {
                     global_logic!(ui).invoke_video_editor_add_empty_audio_track();
                 }
-                "video-editor-add-empyt-subtitle-track" => {
+                "video-editor-add-empty-subtitle-track" => {
                     global_logic!(ui).invoke_video_editor_add_empty_subtitle_track();
                 }
-                "video-editor-add-empyt-overlay-track" => {
+                "video-editor-add-empty-overlay-track" => {
                     global_logic!(ui).invoke_video_editor_add_empty_overlay_track();
                 }
                 "video-editor-track-move-up" => {

wayshot/src/logic/video_editor/preview.rs

@@ -146,6 +146,8 @@ fn video_editor_preview_fast_forward(ui: &AppWindow) {
 
 fn video_editor_preview_toggle(ui: &AppWindow) {
     create_renderer_if_none(ui);
+    let ui_state = global_store!(ui).get_video_editor_ui_state();
+    let volume = ui_state.preview_volumn.clamp(0.0, 100.0) / 100.0;
 
     let mut renderer_guard = PREVIEW_RENDERER.lock().unwrap();
     if let Some(ref mut r) = *renderer_guard {
@@ -157,6 +159,7 @@ fn video_editor_preview_toggle(ui: &AppWindow) {
                 global_store!(ui).set_video_editor_is_previewing(false);
             }
             PlaybackState::Stopped | PlaybackState::Paused => {
+                r.set_volume(volume);
                 if let Err(e) = r.play() {
                     crate::toast_warn!(ui, format!("Failed to start playback: {:?}", e));
                     return;

wayshot/ui/base/icon.slint

@@ -324,6 +324,8 @@ export global Icons {
     out property <image> unsave-light: @image-url("../images/icons/unsave-light.svg");
     out property <image> empty-fill: @image-url("../images/icons/empty-fill.svg");
     out property <image> empty-light: @image-url("../images/icons/empty-light.svg");
+    out property <image> skip-next-fill: @image-url("../images/icons/skip-next-fill.svg");
+    out property <image> skip-previous-fill: @image-url("../images/icons/skip-previous-fill.svg");
 
     out property <image> landing-account: @image-url("../images/landing/landing-account.svg");
     out property <image> landing-language-switch: @image-url("../images/landing/landing-language-switch.svg");

wayshot/ui/images/icons/skip-next-fill.svg

@@ -22,8 +22,8 @@ component Btns inherits Rectangle {
         spacing: Theme.spacing * 4;
 
         IconBtn {
-            icon: Icons.arrow-left-fill;
-            icon-size: Theme.icon-size * 0.9;
+            icon: Icons.skip-previous-fill;
+            icon-size: Theme.icon-size * 1.3;
             tip: Logic.tr("previous");
             is-show-tip: true;
             clicked => {
@@ -52,16 +52,16 @@ component Btns inherits Rectangle {
 
         IconBtn {
             icon: Icons.fast-forward-fill;
-            tip: Logic.tr("fast forward");
+            tip: Logic.tr("forward");
             is-show-tip: true;
             clicked => {
                 Logic.video-editor-preview-fast-forward();
             }
         }
 
         IconBtn {
-            icon: Icons.arrow-right-fill;
-            icon-size: Theme.icon-size * 0.9;
+            icon: Icons.skip-next-fill;
+            icon-size: Theme.icon-size * 1.3;
             tip: Logic.tr("next");
             is-show-tip: true;
             clicked => {