[*] update normally

Author: heng30

lib/recorder/examples/recording_5s_demo.rs

@@ -37,6 +37,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // .with_disable_save_file(true)
     .with_audio_device_name(Some(default_input.name))
     .with_enable_recording_speaker(true)
+    // .with_convert_input_wav_to_mono(true)
     .with_resolution(recorder::Resolution::Original((
         screen_infos[0].logical_size.width as u32,
         screen_infos[0].logical_size.height as u32,

lib/recorder/src/lib.rs

@@ -211,4 +211,6 @@ pub struct MergeTracksConfig {
     pub fps: FPS,
     /// Signal to stop the combining process if requested by user
     pub stop_sig: Arc<AtomicBool>,
+
+    pub convert_input_wav_to_mono: bool,
 }

lib/recorder/src/mp4_ffmpeg.rs

@@ -81,18 +81,6 @@ pub fn is_ffmpeg_installed() -> bool {
 ///     Err(e) => eprintln!("Error: {}", e),
 /// }
 /// ```
-// ffmpeg \
-//     -i input.h264 \
-//     -i input.wav \
-//     -i speaker.wav \
-//     -c:v copy \
-//     -c:a aac \
-//     -b:a:0 128k \
-//     -b:a:1 128k \
-//     -map 0:v \
-//     -map 1:a \
-//     -map 2:a \
-//     -y output.mp4
 pub fn merge_tracks(
     config: MergeTracksConfig,
     mut progress_cb: impl FnMut(f32),
@@ -131,31 +119,49 @@ pub fn merge_tracks(
 
     cmd.args(&["-c:v", "copy"]);
 
-    if config.input_wav_path.is_some() || config.speaker_wav_path.is_some() {
-        cmd.args(&["-c:a", "aac"]);
-    }
-
-    if config.input_wav_path.is_some() {
-        cmd.args(&["-b:a:0", "128k"]);
-    }
-
-    if config.speaker_wav_path.is_some() {
-        cmd.args(&["-b:a:1", "128k"]);
-    }
-
-    cmd.args(&["-map", "0:v"]);
-
-    if config.input_wav_path.is_some() {
-        cmd.args(&["-map", "1:a"]);
-    }
-
-    if config.speaker_wav_path.is_some() {
-        cmd.args(&["-map", "2:a"]);
+    if config.input_wav_path.is_some() && config.speaker_wav_path.is_some() {
+        cmd.args(&[
+            "-filter_complex",
+            if config.convert_input_wav_to_mono {
+                "[1:a]pan=mono|c0=0.5*FL+0.5*FR[a1];[a1][2:a]amix=inputs=2:duration=longest[a]"
+            } else {
+                "[1:a][2:a]amix=inputs=2:duration=longest[a]"
+            },
+            "-map",
+            "0:v",
+            "-map",
+            "[a]",
+            "-c:a",
+            "aac",
+            "-b:a",
+            "128k",
+        ]);
+    } else if config.input_wav_path.is_some() {
+        if config.convert_input_wav_to_mono {
+            cmd.args(&[
+                "-filter_complex",
+                "[1:a]pan=mono|c0=0.5*FL+0.5*FR[a]",
+                "-map",
+                "0:v",
+                "-map",
+                "[a]",
+                "-c:a",
+                "aac",
+                "-b:a",
+                "128k",
+            ]);
+        } else {
+            cmd.args(&["-map", "0:v", "-map", "1:a", "-c:a", "aac", "-b:a", "128k"]);
+        }
+    } else if config.speaker_wav_path.is_some() {
+        cmd.args(&["-map", "0:v", "-map", "1:a", "-c:a", "aac", "-b:a", "128k"]);
+    } else {
+        unimplemented!();
     }
 
     let mut child_process = cmd
-        .output(config.output_path.display().to_string())
         .overwrite()
+        .output(config.output_path.display().to_string())
         .print_command()
         .spawn()
         .map_err(|e| RecorderError::Ffmpeg(format!("ffmpeg spawn child process failed. {e}")))?;

lib/recorder/src/recorder.rs

@@ -848,6 +848,7 @@ impl RecordingSession {
                 output_path: tmp_output_file.clone(),
                 fps: self.config.fps,
                 stop_sig: self.stop_sig_combine,
+                convert_input_wav_to_mono: self.config.convert_input_wav_to_mono,
             };
 
             let combine_tracks_state = merge_tracks(combine_config, combine_progress_cb)?;

lib/recorder/src/recorder_config.rs

@@ -140,6 +140,8 @@ pub struct RecorderConfig {
 
     #[setters(strip_option)]
     pub speaker_amplification: Option<Arc<AtomicI32>>,
+
+    pub convert_input_wav_to_mono: bool,
 }
 
 impl RecorderConfig {
@@ -195,6 +197,7 @@ impl RecorderConfig {
             disable_save_file: false,
             audio_amplification: None,
             speaker_amplification: None,
+            convert_input_wav_to_mono: false,
         }
     }
 

wayshot/src/config.rs

@@ -128,6 +128,8 @@ pub struct Recorder {
     #[derivative(Default(value = "true"))]
     pub enable_preview: bool,
 
+    pub convert_input_wav_to_mono: bool,
+
     #[derivative(Default(value = "fps_default()"))]
     pub fps: UIFps,
 

wayshot/src/logic/recorder.rs

@@ -497,6 +497,7 @@ fn inner_start_recording(ui_weak: Weak<AppWindow>) -> Result<()> {
     )
     .with_enable_frame_channel_user(true)
     .with_enable_preview_mode(all_config.recorder.enable_preview)
+    .with_convert_input_wav_to_mono(all_config.recorder.convert_input_wav_to_mono)
     .with_enable_recording_speaker(all_config.control.enable_desktop_speaker)
     .with_include_cursor(all_config.recorder.include_cursor)
     .with_remove_cache_files(all_config.recorder.remove_temporary_files)