[*] refactor: video-editor

heng30 · heng30 · commit 7e082926fc24 · 2026-02-28T12:37:23.000+08:00
diff --git a/lib/video-editor/examples/export_audio_demo.rs b/lib/video-editor/examples/export_audio_demo.rs
@@ -53,6 +53,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track = VideoTrack {
+        name: "Video Track".to_string(),
         hiding: false,
         muted: false,
         track: inner_track,
diff --git a/lib/video-editor/examples/export_to_mp4_demo.rs b/lib/video-editor/examples/export_to_mp4_demo.rs
@@ -43,6 +43,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track = VideoTrack {
+        name: "Video Track".to_string(),
         hiding: false,
         muted: false,
         track: inner_track,
diff --git a/lib/video-editor/examples/export_to_mp4_with_compression_demo.rs b/lib/video-editor/examples/export_to_mp4_with_compression_demo.rs
@@ -43,6 +43,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track = VideoTrack {
+        name: "Video Track".to_string(),
         hiding: false,
         muted: false,
         track: inner_track,
diff --git a/lib/video-editor/examples/export_to_mp4_with_subtitle_demo.rs b/lib/video-editor/examples/export_to_mp4_with_subtitle_demo.rs
@@ -47,6 +47,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track = VideoTrack {
+        name: "Video Track".to_string(),
         hiding: false,
         muted: false,
         track: video_inner_track,
diff --git a/lib/video-editor/examples/get_composited_frame_demo.rs b/lib/video-editor/examples/get_composited_frame_demo.rs
@@ -34,6 +34,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track1 = VideoTrack {
+        name: "Video Track 1".to_string(),
         hiding: false,
         muted: false,
         track: inner_track1,
diff --git a/lib/video-editor/examples/multi_track_composition_frame_demo.rs b/lib/video-editor/examples/multi_track_composition_frame_demo.rs
@@ -67,6 +67,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track1 = VideoTrack {
+        name: "Video Track 1".to_string(),
         hiding: false,
         muted: false,
         track: inner_track1,
@@ -86,6 +87,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track2 = VideoTrack {
+        name: "Video Track 2".to_string(),
         hiding: false,
         muted: false,
         track: inner_track2,
diff --git a/lib/video-editor/examples/play_audio_track_demo.rs b/lib/video-editor/examples/play_audio_track_demo.rs
@@ -66,6 +66,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         };
 
         let audio_track = AudioTrack {
+            name: format!("Audio Track {}", file_path.display()),
             hiding: false,
             track: inner_track,
         };
diff --git a/lib/video-editor/examples/play_video_track_demo.rs b/lib/video-editor/examples/play_video_track_demo.rs
@@ -113,6 +113,7 @@ impl VideoViewerApp {
         };
 
         let overlay_text_track = OverlayTrack {
+            name: "Text Overlay".to_string(),
             hiding: false,
             track: overlay_text_inner_track,
         };
@@ -159,6 +160,7 @@ impl VideoViewerApp {
         };
 
         let mkv_video_track = VideoTrack {
+            name: "MKV Video Track".to_string(),
             hiding: false,
             muted: false,
             track: mkv_inner_track,
@@ -205,6 +207,7 @@ impl VideoViewerApp {
         };
 
         let video_track = VideoTrack {
+            name: "MP4 Video Track".to_string(),
             hiding: false,
             muted: false,
             track: inner_track,
diff --git a/lib/video-editor/examples/preview_player_egui_demo.rs b/lib/video-editor/examples/preview_player_egui_demo.rs
@@ -77,6 +77,7 @@ impl PreviewPlayerApp {
             };
 
             let video_track = VideoTrack {
+                name: "Video Track".to_string(),
                 hiding: false,
                 muted: false,
                 track: video_inner_track,
@@ -112,6 +113,7 @@ impl PreviewPlayerApp {
                     };
 
                     let audio_track = AudioTrack {
+                        name: "Audio Track".to_string(),
                         hiding: false,
                         track: audio_inner_track,
                     };
diff --git a/lib/video-editor/examples/segment_hiding_demo.rs b/lib/video-editor/examples/segment_hiding_demo.rs
@@ -65,6 +65,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
 
     let video_track = VideoTrack {
+        name: "Video Track".to_string(),
         hiding: false,
         muted: false,
         track: inner_track,
diff --git a/lib/video-editor/examples/undo_redo_demo.rs b/lib/video-editor/examples/undo_redo_demo.rs
@@ -58,6 +58,7 @@ fn main() -> Result<()> {
     let metadata3 = create_test_metadata();
 
     let track1 = Track::Video(Arc::new(video_editor::tracks::video_track::VideoTrack {
+        name: "Video Track 1".to_string(),
         hiding: false,
         muted: false,
         track: video_editor::tracks::track::InnerTrack {
@@ -68,6 +69,7 @@ fn main() -> Result<()> {
     }));
 
     let track2 = Track::Audio(Arc::new(video_editor::tracks::audio_track::AudioTrack {
+        name: "Audio Track 1".to_string(),
         hiding: false,
         track: video_editor::tracks::track::InnerTrack {
             duration: Duration::from_secs(15),
@@ -77,6 +79,7 @@ fn main() -> Result<()> {
     }));
 
     let track3 = Track::Video(Arc::new(video_editor::tracks::video_track::VideoTrack {
+        name: "Video Track 2".to_string(),
         hiding: false,
         muted: false,
         track: video_editor::tracks::track::InnerTrack {
diff --git a/lib/video-editor/src/export/audio_exporter.rs b/lib/video-editor/src/export/audio_exporter.rs
@@ -1,4 +1,4 @@
-use super::progress::{ExportPhase, ExportProgress};
+use super::progress::{CancellationToken, ExportPhase, ExportProgress};
 use crate::{
     Error, Result,
     tracks::{
@@ -34,11 +34,11 @@ pub enum AudioExportFormat {
 impl AudioExportFormat {
     pub fn extension(&self) -> &str {
         match self {
-            Self::Aac => ".aac",
-            Self::Mp3 => ".mp3",
-            Self::Wav => ".wav",
-            Self::Flac => ".flac",
-            Self::Ogg => ".ogg",
+            Self::Aac => "aac",
+            Self::Mp3 => "mp3",
+            Self::Wav => "wav",
+            Self::Flac => "flac",
+            Self::Ogg => "ogg",
         }
     }
 
@@ -60,6 +60,8 @@ pub struct AudioExportConfig {
     #[derivative(Default(value = "PathBuf::from(\"audio\")"))]
     pub output_path: PathBuf,
 
+    pub cancellation_token: Option<CancellationToken>,
+
     #[derivative(Default(value = "AudioExportFormat::Aac"))]
     pub format: AudioExportFormat,
 
@@ -93,6 +95,15 @@ impl AudioExporter {
         self.export_with_progress(|_| {})
     }
 
+    fn check_cancelled(&self) -> Result<()> {
+        if let Some(token) = &self.config.cancellation_token
+            && token.is_cancelled()
+        {
+            return Err(Error::ExportCancelled);
+        }
+        Ok(())
+    }
+
     pub fn export_with_progress<F>(&self, mut progress_fn: F) -> Result<AudioExportResult>
     where
         F: FnMut(ExportProgress),
@@ -121,7 +132,7 @@ impl AudioExporter {
         });
 
         let mut output_path = self.config.output_path.clone();
-        output_path.set_extension(self.config.format.extension().trim_start_matches('.'));
+        output_path.set_extension(self.config.format.extension());
 
         match self.config.format {
             AudioExportFormat::Aac => {
@@ -235,6 +246,7 @@ impl AudioExporter {
 
         let mut all_samples = Vec::new();
         for audio_data in mixer {
+            self.check_cancelled()?;
             all_samples.extend_from_slice(&audio_data.samples);
         }
 
@@ -299,6 +311,7 @@ impl AudioExporter {
             .collect();
 
         for chunk in i16_samples.chunks(samples_per_frame) {
+            self.check_cancelled()?;
             if chunk.len() < samples_per_frame {
                 // Pad the last chunk
                 input_buffer.extend_from_slice(chunk);
@@ -320,6 +333,7 @@ impl AudioExporter {
 
         // Flush encoder
         loop {
+            self.check_cancelled()?;
             match encoder.encode(&[], &mut output_buffer) {
                 Ok(info) if info.output_size > 0 => {
                     file.write_all(&output_buffer[..info.output_size])?;
@@ -405,6 +419,7 @@ impl AudioExporter {
         let complete_frames = (i16_samples.len() / frame_size) * frame_size;
 
         for chunk in i16_samples[..complete_frames].chunks(frame_size) {
+            self.check_cancelled()?;
             // Reserve buffer space for this chunk
             mp3_buffer.clear();
             mp3_buffer.reserve(mp3lame_encoder::max_required_buffer_size(chunk.len()));
@@ -429,6 +444,7 @@ impl AudioExporter {
 
         // Handle partial frame at the end by padding with zeros
         if i16_samples.len() > complete_frames {
+            self.check_cancelled()?;
             let remaining = &i16_samples[complete_frames..];
             if !remaining.is_empty() {
                 // Pad to complete frame size
@@ -437,7 +453,9 @@ impl AudioExporter {
                 padded_chunk.resize(frame_size, 0);
 
                 mp3_buffer.clear();
-                mp3_buffer.reserve(mp3lame_encoder::max_required_buffer_size(padded_chunk.len()));
+                mp3_buffer.reserve(mp3lame_encoder::max_required_buffer_size(
+                    padded_chunk.len(),
+                ));
 
                 let input = InterleavedPcm(&padded_chunk);
                 let encoded_size = encoder
@@ -459,6 +477,7 @@ impl AudioExporter {
 
         // Flush encoder to write final frames
         loop {
+            self.check_cancelled()?;
             mp3_buffer.clear();
             mp3_buffer.reserve(7200); // Standard MP3 frame size
 
@@ -513,7 +532,9 @@ impl AudioExporter {
         let valid_samples = samples_per_channel * channels as usize;
 
         for &sample in &samples.samples[..valid_samples] {
+            self.check_cancelled()?;
             let clamped = sample.clamp(-1.0, 1.0);
+
             writer.write_sample(clamped).map_err(|e| {
                 Error::IO(std::io::Error::new(
                     std::io::ErrorKind::Other,
@@ -572,6 +593,8 @@ impl AudioExporter {
             })
             .collect();
 
+        self.check_cancelled()?;
+
         encoder.write(&i24_samples).map_err(|e| {
             Error::IO(std::io::Error::new(
                 std::io::ErrorKind::Other,
@@ -643,6 +666,7 @@ impl AudioExporter {
         let mut block_count = 0;
 
         for block_idx in 0..total_blocks {
+            self.check_cancelled()?;
             let start = block_idx * block_size;
             let end = (start + block_size).min(samples_per_channel);
 
diff --git a/lib/video-editor/src/export/config.rs b/lib/video-editor/src/export/config.rs
@@ -1,6 +1,9 @@
 pub use video_encoder::{CompressionPreset, Tune};
 
-use super::codecs::{BitrateMode, CodecConfig, ExportPreset, QualityPreset};
+use super::{
+    codecs::{BitrateMode, CodecConfig, ExportPreset, QualityPreset},
+    progress::CancellationToken,
+};
 
 #[derive(Debug, Clone, derive_setters::Setters, derivative::Derivative)]
 #[derivative(Default)]
@@ -10,6 +13,8 @@ pub struct Mp4ExportConfig {
     #[derivative(Default(value = "std::path::PathBuf::from(\"output.mp4\")"))]
     pub output_path: std::path::PathBuf,
 
+    pub cancellation_token: Option<CancellationToken>,
+
     pub width: Option<u32>,
     pub height: Option<u32>,
     pub fps: Option<u32>,
@@ -45,6 +50,7 @@ impl Mp4ExportConfig {
 
         Mp4ExportConfig {
             output_path: std::path::PathBuf::from("output.mp4"),
+            cancellation_token: None,
             width: config.width,
             height: config.height,
             fps: config.fps,
diff --git a/lib/video-editor/src/export/exporter.rs b/lib/video-editor/src/export/exporter.rs
@@ -60,6 +60,15 @@ impl Mp4Exporter {
         self.export_with_progress(|_progress| {})
     }
 
+    fn check_cancelled(&self) -> Result<()> {
+        if let Some(token) = &self.config.cancellation_token
+            && token.is_cancelled()
+        {
+            return Err(Error::ExportCancelled);
+        }
+        Ok(())
+    }
+
     pub fn export_with_progress<F>(&self, mut progress_fn: F) -> Result<ExportResult>
     where
         F: FnMut(ExportProgress),
@@ -211,6 +220,7 @@ impl Mp4Exporter {
         let mut frames_processed = 0u64;
 
         for unified_frame in mixer_iter {
+            self.check_cancelled()?;
             self.process_single_frame(ctx, octx, &unified_frame, &mut frames_processed)?;
 
             self.report_progress(
@@ -305,6 +315,7 @@ impl Mp4Exporter {
             let aac_frame_size = encoder.samples_per_frame * encoder.channels as usize;
 
             for chunk_start in (0..audio_data.samples.len()).step_by(aac_frame_size) {
+                self.check_cancelled()?;
                 let chunk_end = (chunk_start + aac_frame_size).min(audio_data.samples.len());
                 let chunk = &audio_data.samples[chunk_start..chunk_end];
 
diff --git a/lib/video-editor/src/export/progress.rs b/lib/video-editor/src/export/progress.rs
@@ -1,7 +1,36 @@
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 
 pub type ProgressCallback = Box<dyn Fn(ExportProgress) + Send + Sync>;
 
+#[derive(Debug, Clone)]
+pub struct CancellationToken {
+    cancelled: Arc<AtomicBool>,
+}
+
+impl Default for CancellationToken {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl CancellationToken {
+    pub fn new() -> Self {
+        Self {
+            cancelled: Arc::new(AtomicBool::new(false)),
+        }
+    }
+
+    pub fn is_cancelled(&self) -> bool {
+        self.cancelled.load(Ordering::Relaxed)
+    }
+
+    pub fn cancel(&self) {
+        self.cancelled.store(true, Ordering::Relaxed);
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ExportPhase {
     Initializing,
diff --git a/lib/video-editor/src/export/subtitle_exporter.rs b/lib/video-editor/src/export/subtitle_exporter.rs
diff --git a/lib/video-editor/src/lib.rs b/lib/video-editor/src/lib.rs
diff --git a/wayshot/src/logic/video_editor/export.rs b/wayshot/src/logic/video_editor/export.rs
