[*] refactor: video-editor

Author: heng30

lib/video-editor/examples/play_video_track_demo.rs

@@ -37,33 +37,27 @@ impl VideoViewerApp {
 
         // ===== 添加 Overlay 轨道 1: 图片 overlay (最上层) =====
         let overlay_image_path = PathBuf::from("data").join("test.png");
-        let overlay_image_duration = Duration::from_secs(3);
-
-        let overlay_image_metadata = Arc::new(get_metadata(&overlay_image_path).unwrap());
-
         if !overlay_image_path.exists() {
             log::warn!(
                 "Image file not found: {}, using default metadata",
                 overlay_image_path.display()
             );
         }
 
+        let overlay_image_duration = Duration::from_secs(3);
+        let overlay_image_metadata = Arc::new(get_metadata(&overlay_image_path).unwrap());
+
         let overlay_image_segment = Arc::new(Segment::new(
             Duration::from_secs_f64(0.5), // 从 0.5 秒开始
             overlay_image_duration,
             overlay_image_metadata.clone(),
         ));
 
-        let overlay_image_inner_track = InnerTrack {
-            metadata: overlay_image_metadata,
-            segments: vec![overlay_image_segment],
-            duration: Duration::from_secs_f64(0.5) + overlay_image_duration,
-        };
-
-        let overlay_image_track = OverlayTrack {
-            hiding: false,
-            track: overlay_image_inner_track,
-        };
+        let overlay_image_track = OverlayTrack::new(
+            overlay_image_metadata,
+            Duration::from_secs_f64(0.5) + overlay_image_duration,
+            vec![overlay_image_segment],
+        );
 
         manager.add_track(Track::Overlay(Arc::new(overlay_image_track)));
         log::info!(

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

@@ -4,6 +4,7 @@ use crate::{
         subtitle::{renderer::render_text_to_image, style::SubtitleStyle},
         traits::{OverlayImageData, VideoFilterConfig},
     },
+    metadata::Metadata,
     tracks::{segment::Segment, track::InnerTrack, video_frame_cache::VideoImage},
 };
 use image::RgbaImage;
@@ -16,7 +17,11 @@ pub struct OverlayTrack {
 }
 
 impl OverlayTrack {
-    pub fn new(track: InnerTrack) -> Self {
+    pub fn new(metadata: Arc<Metadata>, duration: Duration, segments: Vec<Arc<Segment>>) -> Self {
+        Self::new_with_inner(InnerTrack::new(metadata, duration, segments))
+    }
+
+    pub fn new_with_inner(track: InnerTrack) -> Self {
         Self {
             hiding: false,
             track,

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

@@ -24,6 +24,16 @@ pub struct InnerTrack {
     pub segments: Vec<Arc<Segment>>,
 }
 
+impl InnerTrack {
+    pub fn new(metadata: Arc<Metadata>, duration: Duration, segments: Vec<Arc<Segment>>) -> Self {
+        Self {
+            metadata,
+            duration,
+            segments,
+        }
+    }
+}
+
 impl Track {
     pub fn new<P: AsRef<Path>>(path: P) -> Result<Vec<Track>> {
         let path = path.as_ref();
@@ -39,11 +49,7 @@ impl Track {
 
                 Ok(vec![Track::Video(Arc::new(VideoTrack {
                     hiding: false,
-                    track: InnerTrack {
-                        duration,
-                        metadata: metadata.clone(),
-                        segments: vec![video_segment],
-                    },
+                    track: InnerTrack::new(metadata.clone(), duration, vec![video_segment]),
                 }))])
             }
             MetadataType::Text => {
@@ -52,11 +58,7 @@ impl Track {
 
                 Ok(vec![Track::Overlay(Arc::new(OverlayTrack {
                     hiding: false,
-                    track: InnerTrack {
-                        duration,
-                        metadata: metadata.clone(),
-                        segments: vec![text_segment],
-                    },
+                    track: InnerTrack::new(metadata.clone(), duration, vec![text_segment]),
                 }))])
             }
             MetadataType::Image => {
@@ -65,11 +67,7 @@ impl Track {
 
                 Ok(vec![Track::Overlay(Arc::new(OverlayTrack {
                     hiding: false,
-                    track: InnerTrack {
-                        duration,
-                        metadata: metadata.clone(),
-                        segments: vec![image_segment],
-                    },
+                    track: InnerTrack::new(metadata.clone(), duration, vec![image_segment]),
                 }))])
             }
             MetadataType::Audio => {
@@ -78,11 +76,7 @@ impl Track {
 
                 Ok(vec![Track::Audio(Arc::new(AudioTrack {
                     hiding: false,
-                    track: InnerTrack {
-                        duration,
-                        metadata: metadata.clone(),
-                        segments: vec![audio_segment],
-                    },
+                    track: InnerTrack::new(metadata.clone(), duration, vec![audio_segment]),
                 }))])
             }
             MetadataType::Subtitle => {
@@ -859,11 +853,7 @@ impl Track {
         Ok(vec![Track::Subtitle(Arc::new(SubtitleTrack {
             hiding: false,
             subtitles: entries,
-            track: InnerTrack {
-                duration: total_duration,
-                metadata,
-                segments,
-            },
+            track: InnerTrack::new(metadata, total_duration, segments),
         }))])
     }
 }