[*] refactor video editor

Author: heng30

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

@@ -340,7 +340,7 @@ fn extract_segment_frames_worker(
                             let relative_timeline_offset = relative_segment_timeline_offset_start
                                 + output_converter.frame_to_duration(received_count);
 
-                            let filtered_frame = apply_filter_to_frame(
+                            let filtered_frame = apply_filter_to_frame_for_video(
                                 &config_clone,
                                 frame,
                                 from_seg.clone(),
@@ -408,7 +408,7 @@ fn send_empty_frame(
     Ok(())
 }
 
-fn apply_filter_to_frame(
+fn apply_filter_to_frame_for_video(
     config: &DecodeVideoConfig,
     frame: VideoImage,
     segment: Arc<Segment>,
@@ -757,10 +757,7 @@ fn render_image_segment(
                     relative_timeline_offset: frame_offset,
                 };
                 if let Err(e) = filter.inner.apply(&mut ui_data) {
-                    log::warn!(
-                        "Apply image filter: `{}` failed: {e}",
-                        filter.inner.name()
-                    );
+                    log::warn!("Apply image filter: `{}` failed: {e}", filter.inner.name());
                 }
                 image = ui_data.frames.pop().unwrap_or(VideoImage::Empty);
                 image_for_composite = None;
@@ -773,10 +770,7 @@ fn render_image_segment(
                     relative_timeline_offset: frame_offset,
                 };
                 if let Err(e) = filter.inner.apply(&mut composite_data) {
-                    log::warn!(
-                        "Apply image filter: `{}` failed: {e}",
-                        filter.inner.name()
-                    );
+                    log::warn!("Apply image filter: `{}` failed: {e}", filter.inner.name());
                 }
                 image_for_composite = composite_data.frames.pop();
             }

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

@@ -649,32 +649,54 @@ impl Iterator for UnifiedVideoTracksCompositorIterator {
     }
 }
 
-// 将前景帧按左上角对齐合成到背景帧上（简单的 Alpha 混合）
+// 将前景帧合成到背景帧上（居中对齐，简单的 Alpha 混合）
 // alpha == 255: 直接覆盖背景像素
 // alpha > 0: Alpha 混合前景和背景
 // alpha == 0: 完全透明，保持背景不变
 pub fn composite_frame(composited: &mut RgbaImage, foreground: &VideoImage) {
     match foreground {
         VideoImage::Empty => (),
         VideoImage::Image { buffer } => {
-            let fg_width = buffer.width().min(composited.width());
-            let fg_height = buffer.height().min(composited.height());
+            let fg_width = buffer.width();
+            let fg_height = buffer.height();
+            let bg_width = composited.width();
+            let bg_height = composited.height();
+
+            // Center the foreground if smaller than background
+            let x_offset = if fg_width < bg_width {
+                (bg_width - fg_width) / 2
+            } else {
+                0
+            };
+            let y_offset = if fg_height < bg_height {
+                (bg_height - fg_height) / 2
+            } else {
+                0
+            };
 
-            for y in 0..fg_height {
-                for x in 0..fg_width {
+            // Clamp dimensions for iteration
+            let iter_width = fg_width.min(bg_width);
+            let iter_height = fg_height.min(bg_height);
+
+            for y in 0..iter_height {
+                for x in 0..iter_width {
                     let fg_pixel = buffer.get_pixel(x, y);
                     let fg_alpha = fg_pixel[3];
 
+                    // Apply pixel at centered position
+                    let bg_x = x_offset + x;
+                    let bg_y = y_offset + y;
+
                     if fg_alpha == 255 {
                         // 不透明：直接覆盖
-                        let bg_pixel = composited.get_pixel_mut(x, y);
+                        let bg_pixel = composited.get_pixel_mut(bg_x, bg_y);
                         bg_pixel[0] = fg_pixel[0];
                         bg_pixel[1] = fg_pixel[1];
                         bg_pixel[2] = fg_pixel[2];
                         bg_pixel[3] = fg_pixel[3];
                     } else if fg_alpha > 0 {
                         // 半透明：Alpha 混合
-                        let bg_pixel = composited.get_pixel_mut(x, y);
+                        let bg_pixel = composited.get_pixel_mut(bg_x, bg_y);
                         let alpha = fg_alpha as f32 / 255.0;
                         let inv_alpha = 1.0 - alpha;
 

todo.md

@@ -1,6 +1,6 @@
 ## 问题
-- 联动模式下，拖拽segment左边缘是保持左边缘位置不变，但是源文件的开始时间改变，现在是改变segment的时长。
-- filter 取消选中，黑屏，应该显示preveiw图片
+- playlist 和 library thumbnail预览图片变形了
+- filter没有参数时，下面呃呃详情面板应该显示没有图片
 
 ## 待验证
 - 视频轨道分离字幕

wayshot/src/logic/video_editor/conversion.rs

@@ -1,3 +1,4 @@
+use super::command::with_history_manager;
 use crate::slint_generatedAppWindow::{
     AudioChannels as UIAudioChannels, AudioFormat as UIAudioFormat,
     AudioSampleRate as UIAudioSampleRate, FilterType as UIFilterType, Fps as UIFps,
@@ -23,8 +24,8 @@ use video_editor::{
     commands::filter::FilterType,
     export::{AudioExportFormat, SubtitleFormat},
     filters::{
-        AudioFilter, AudioFilterWrapper, ImageFilterWrapper, SubtitleFilter,
-        SubtitleFilterWrapper, VideoFilter, VideoFilterWrapper,
+        AudioFilter, AudioFilterWrapper, ImageFilterWrapper, SubtitleFilter, SubtitleFilterWrapper,
+        VideoFilter, VideoFilterWrapper,
         audio::{
             CompressorFilter, FadeInFilter as AudioFadeInFilter,
             FadeOutFilter as AudioFadeOutFilter, GainFilter, LimiterFilter, MuteLeftFilter,
@@ -664,11 +665,19 @@ impl From<UIFilterType> for FilterType {
 pub fn layer_frame_to_ui(layer: &LayerFrame) -> Option<UIVideoEditorLayerImage> {
     match &layer.image {
         VideoImage::Image { buffer, .. } => {
+            let is_image_track = with_history_manager(|state| {
+                state
+                    .tracks_manager
+                    .get(layer.track_index)
+                    .map(|t| t.is_image())
+                    .unwrap_or(false)
+            });
+
             let transform: UITransformDetail = layer
                 .from_segment
                 .as_ref()
                 .and_then(|(_, segment)| {
-                    if segment.metadata.is_image() {
+                    if is_image_track {
                         segment
                             .image_filters
                             .iter()