[*] refactor

Author: heng30

lib/video-editor/src/export/exporter.rs

@@ -481,6 +481,34 @@ impl Mp4Exporter {
         Ok(stream.index())
     }
 
+    // Generate AudioSpecificConfig for AAC in MP4
+    // Format: [AOT (5 bits) | freq_index (4 bits) | channel_config (4 bits) | ...]
+    fn generate_audio_specific_config(sample_rate: u32, channels: u16) -> Vec<u8> {
+        let audio_object_type = 2; // AAC-LC
+        let freq_index = Self::sample_rate_index(sample_rate);
+        let byte1 = (audio_object_type << 3) | (freq_index >> 1);
+        let byte2 = ((freq_index & 0x1) << 7) | ((channels as u8) << 3);
+        vec![byte1, byte2]
+    }
+
+    fn sample_rate_index(sample_rate: u32) -> u8 {
+        match sample_rate {
+            96000 => 0,
+            88200 => 1,
+            64000 => 2,
+            48000 => 3,
+            44100 => 4,
+            32000 => 5,
+            24000 => 6,
+            22050 => 7,
+            16000 => 8,
+            12000 => 9,
+            11025 => 10,
+            8000 => 11,
+            _ => 4, // Default to 44100
+        }
+    }
+
     fn add_audio_stream(
         &self,
         octx: &mut ffmpeg_next::format::context::Output,
@@ -511,6 +539,16 @@ impl Mp4Exporter {
                 );
                 (*codec_par).format = 8; // AV_SAMPLE_FMT_FLTP (planar float, typically used by AAC)
                 (*codec_par).bit_rate = self.config.audio_bitrate as i64;
+
+                // Add AudioSpecificConfig as extradata for AAC decoder configuration
+                let asc = Self::generate_audio_specific_config(sample_rate, channels);
+                (*codec_par).extradata = ffmpeg_next::ffi::av_malloc(asc.len()) as *mut _;
+                (*codec_par).extradata_size = asc.len() as i32;
+                std::ptr::copy_nonoverlapping(
+                    asc.as_ptr() as *const _,
+                    (*codec_par).extradata as *mut _,
+                    asc.len(),
+                );
             }
         }
 

wayshot/src/logic/video_editor/project.rs

@@ -113,7 +113,6 @@ pub fn init(ui: &AppWindow) {
 
     logic_cb!(video_editor_update_ui_state, ui);
     logic_cb!(video_editor_show_new_project_dialog, ui);
-    logic_cb!(video_editor_new_project, ui, config);
     logic_cb!(video_editor_init_recent, ui);
     logic_cb!(video_editor_show_recent_dialog, ui);
     logic_cb!(video_editor_open_recent_project, ui, index);
@@ -228,38 +227,32 @@ fn video_editor_update_ui_state(ui: &AppWindow) {
 }
 
 fn video_editor_show_new_project_dialog(ui: &AppWindow) {
-    global_store!(ui).set_video_editor_is_show_new_project_dialog(true);
-}
-
-fn video_editor_new_project(ui: &AppWindow, config: UIVideoEditorNewProjectConfig) {
     let ui_weak = ui.as_weak();
-    global_store!(ui).set_video_editor_is_show_new_project_dialog(false);
-
-    let preview_config: VideoEditorPreviewConfig = config.preview_config.clone().into();
-    db_update_preview_config(ui.as_weak(), preview_config);
+    let ui_preview_config = global_store!(ui)
+        .get_video_editor_new_project_config()
+        .preview_config;
+    let preview_config: ProjectPreviewConfig = ui_preview_config.clone().into();
 
     tokio::spawn(async move {
-        let Some(dir) = picker_directory(ui_weak.clone(), &tr("Choose project directory"), "")
-        else {
+        let Some(mut path) = picker_save_file(
+            ui_weak.clone(),
+            &tr("New Project"),
+            &tr("Wayshot Project"),
+            &[PROJECT_EXT],
+            &format!("untitled_{}", chrono::Utc::now().format("%Y%m%d_%H%M%S")),
+        ) else {
             return;
         };
 
-        let project_name_trimmed = config.name.trim().to_string();
-        if project_name_trimmed.is_empty() {
-            toast::async_toast_warn(
-                ui_weak.clone(),
-                tr("Project name cannot be empty or whitespace only").into(),
-            );
-            return;
+        if path.extension().is_none() {
+            path.set_extension(PROJECT_EXT);
         }
 
-        let mut path = dir.join(&project_name_trimmed);
-        path.set_extension(PROJECT_EXT);
         let project_name = path
-            .file_name()
-            .map(|f| f.to_string_lossy().to_string())
-            .unwrap_or_else(|| project_name_trimmed.clone());
-        let preview_config: ProjectPreviewConfig = config.preview_config.clone().into();
+            .file_stem()
+            .and_then(|s| s.to_str())
+            .unwrap_or("Untitled")
+            .to_string();
 
         let (manager, playlist) = {
             let mut state = PROJECT_STATE.lock().unwrap();
@@ -290,8 +283,8 @@ fn video_editor_new_project(ui: &AppWindow, config: UIVideoEditorNewProjectConfi
                     global_store!(ui).set_video_editor_is_unsaved(false);
                     global_store!(ui).set_video_editor_new_project_config(
                         UIVideoEditorNewProjectConfig {
-                            name: project_name_trimmed.into(),
-                            preview_config: preview_config.into(),
+                            name: project_name.clone().into(),
+                            preview_config: ui_preview_config,
                         },
                     );
                     crate::toast_success!(ui, format!("New project created: {}", project_name));

wayshot/ui/logic.slint

@@ -34,7 +34,6 @@ import {
     AudioChannels,
     AudioSampleRate,
     AudioFormat,
-    VideoEditorNewProjectConfig,
     VideoEditorRecentEntry,
     VideoEditorPreviewConfig,
     VideoPreviewSize,
@@ -272,7 +271,6 @@ export global Logic {
 
     callback video-editor-update-ui-state();
     callback video-editor-show-new-project-dialog();
-    callback video-editor-new-project(config: VideoEditorNewProjectConfig);
     callback video-editor-init-recent();
     callback video-editor-show-recent-dialog();
     callback video-editor-open-recent-project(index: int);

wayshot/ui/panel/desktop/home.slint

@@ -38,13 +38,14 @@ export component Home inherits VerticalLayout {
         }
     }
 
-    // if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
-    //     height: parent.height;
-    //
-    //     init => {
-    //         Logic.startup-transcribe-init();
-    //     }
-    // }
+    if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
+        height: parent.height;
+
+        init => {
+            Logic.startup-transcribe-init();
+        }
+    }
+
     //
     // if Store.current-tab-index == TabIndex.ShareScreen: ShareScreenPanel {
     //     width: parent.width;

wayshot/ui/panel/desktop/video-editor/new-project.slint

@@ -16,7 +16,6 @@ import { Header } from "header.slint";
 import { Tracks } from "tracks/tracks.slint";
 import { LeftPanel } from "left-panel/left-panel.slint";
 import { RightPanel } from "right-panel/right-panel.slint";
-import { NewProject } from "new-project.slint";
 import { RecentDialog } from "recent-dialog.slint";
 import { MetadataDialog } from "metadata-dialog.slint";
 import { RecordAudioDialog } from "record-audio-dialog.slint";
@@ -247,26 +246,15 @@ export component VideoEditor inherits Rectangle {
         }
     }
 
-    if Store.video-editor-is-show-new-project-dialog || Store.video-editor-is-show-unsave-change-dialog || Store.video-editor-is-show-recovery-dialog || Store.video-editor-is-show-preview-setting-dialog || Store.video-editor-is-show-preference-setting-dialog: Blanket {
+    if Store.video-editor-is-show-unsave-change-dialog || Store.video-editor-is-show-recovery-dialog || Store.video-editor-is-show-preview-setting-dialog || Store.video-editor-is-show-preference-setting-dialog: Blanket {
         clicked => {
-            Store.video-editor-is-show-new-project-dialog = false;
             Store.video-editor-is-show-unsave-change-dialog = false;
             Store.video-editor-is-show-recovery-dialog = false;
             Store.video-editor-is-show-preview-setting-dialog = false;
             Store.video-editor-is-show-preference-setting-dialog = false;
         }
     }
 
-    if Store.video-editor-is-show-new-project-dialog: NewProject {
-        width: Math.min(Theme.dialog-max-width * Theme.golden-ratio, root.width * Theme.golden-ratio);
-        inner-height: Math.max(root.height * Theme.golden-ratio, Theme.dialog-inner-height);
-
-        escape => {
-            Store.video-editor-is-show-new-project-dialog = false;
-            fs.focus();
-        }
-    }
-
     if Store.video-editor-is-show-preview-setting-dialog: PreviewSettingDialog {
         width: Math.min(Theme.dialog-max-width * Theme.golden-ratio, root.width * Theme.golden-ratio);
         inner-height: Math.max(root.height * Theme.golden-ratio, Theme.dialog-inner-height);

wayshot/ui/panel/desktop/video-editor/video-editor.slint

@@ -757,7 +757,6 @@ export global Store {
     in-out property <[SelectedTrackIndex]> video-editor-selected-tracks-index: [];
     in-out property <[SelectedSegmentIndex]> video-editor-selected-segments-index: [];
     in-out property <KeyboardModifiers> video-editor-keyboard-modifiers;
-    in-out property <bool> video-editor-is-show-new-project-dialog;
     in-out property <bool> video-editor-is-show-unsave-change-dialog;
     in-out property <bool> video-editor-is-show-recovery-dialog;
     in-out property <VideoEditorRecoveryInfo> video-editor-recovery-info;