[*] update normally

Author: heng30

lib/recorder/examples/gain_db_demo.rs

@@ -0,0 +1,24 @@
+use recorder::apply_gain;
+
+fn main() {
+    // Example audio data (-6dBFS sine wave)
+    let mut audio_data = vec![0.5, -0.5, 0.3, -0.3, 0.1, -0.1];
+
+    println!("Original data: {:?}", audio_data);
+
+    // Apply +0dB gain
+    apply_gain(&mut audio_data, 0.0);
+    println!("After +0dB gain: {:?}", audio_data);
+
+    // Apply +6dB gain (amplify by 2x)
+    apply_gain(&mut audio_data, 6.0);
+    println!("After +6dB gain: {:?}", audio_data);
+
+    // Apply -12dB gain (attenuate to approximately 0.25x)
+    apply_gain(&mut audio_data, -12.0);
+    println!("After -12dB gain: {:?}", audio_data);
+
+    // Apply -120dB gain (essentially mute)
+    apply_gain(&mut audio_data, -120.0);
+    println!("After -120dB gain: {:?}", audio_data);
+}

lib/recorder/src/audio_level.rs

@@ -157,3 +157,20 @@ pub fn db_to_normalized(db: f32, min_db: f32, max_db: f32) -> f32 {
     let clamped = db.clamp(min_db, max_db);
     (clamped - min_db) / (max_db - min_db)
 }
+
+/// Convert decibels to linear gain coefficient
+/// Supports both positive gain (amplification) and negative gain (attenuation)
+fn db_to_linear(db: f32) -> f32 {
+    if db <= -120.0 {
+        return 0.0; // Consider as mute below -120dB
+    }
+    10.0f32.powf(db / 20.0)
+}
+
+pub fn apply_gain(audio_data: &mut [f32], db_gain: f32) {
+    let gain = db_to_linear(db_gain);
+
+    for sample in audio_data.iter_mut() {
+        *sample *= gain;
+    }
+}

lib/recorder/src/record_audio.rs

@@ -1,4 +1,4 @@
-use crate::calc_rms_level;
+use crate::{apply_gain, calc_rms_level};
 use cpal::{
     Device, Host, InputCallbackInfo, SampleFormat, Stream, StreamConfig,
     traits::{DeviceTrait, HostTrait, StreamTrait},
@@ -413,12 +413,14 @@ impl StreamingAudioRecorder {
         let recording_session = recorder.start_input_recording(
             device_name,
             move |f32_samples: &[f32], _info: &_| {
-                let mut f32_sample_amplification = vec![0.0; f32_samples.len()];
+                let mut f32_sample_amplification = Vec::with_capacity(f32_samples.len());
                 let data = if let Some(ref amplification) = amplification {
-                    for (index, v) in f32_samples.iter().enumerate() {
-                        f32_sample_amplification[index] =
-                            v * (amplification.load(Ordering::Relaxed) as f32 / 100.0);
-                    }
+                    f32_sample_amplification.extend_from_slice(f32_samples);
+
+                    apply_gain(
+                        &mut f32_sample_amplification,
+                        amplification.load(Ordering::Relaxed) as f32,
+                    );
 
                     &f32_sample_amplification[..]
                 } else {

lib/recorder/src/record_speaker.rs

@@ -1,4 +1,4 @@
-use crate::audio_level::calc_rms_level;
+use crate::audio_level::{apply_gain, calc_rms_level};
 use crossbeam::channel::Sender;
 use pipewire::{
     context::ContextRc,
@@ -412,12 +412,14 @@ impl SpeakerRecorder {
                         )
                     };
 
-                    let mut f32_sample_amplification = vec![0.0; f32_samples.len()];
+                    let mut f32_sample_amplification = Vec::with_capacity(f32_samples.len());
                     let f32_samples = if let Some(ref amplification) = amplification {
-                        for (index, v) in f32_samples.iter().enumerate() {
-                            f32_sample_amplification[index] =
-                                v * (amplification.load(Ordering::Relaxed) as f32 / 100.0);
-                        }
+                        f32_sample_amplification.extend_from_slice(f32_samples);
+
+                        apply_gain(
+                            &mut f32_sample_amplification,
+                            amplification.load(Ordering::Relaxed) as f32,
+                        );
 
                         &f32_sample_amplification[..]
                     } else {

wayshot/src/config.rs

@@ -147,14 +147,16 @@ pub struct Control {
     pub screen: String,
     pub input_audio: String,
 
-    #[derivative(Default(value = "100.0"))]
-    pub input_audio_sound: f32,
+    // db
+    #[derivative(Default(value = "0.0"))]
+    pub input_audio_gain: f32,
 
     #[derivative(Default(value = "true"))]
     pub enable_input_audio: bool,
 
-    #[derivative(Default(value = "100.0"))]
-    pub desktop_speaker_sound: f32,
+    // db
+    #[derivative(Default(value = "0.0"))]
+    pub desktop_speaker_gain: f32,
 
     #[derivative(Default(value = "true"))]
     pub enable_desktop_speaker: bool,

wayshot/src/logic/recorder.rs

@@ -153,7 +153,7 @@ fn init_input_audio(ui: &AppWindow) -> Result<()> {
 
             let mut control_setting = global_store!(ui).get_setting_control();
             control_setting.input_audio = default_input.name.into();
-            control_setting.input_audio_sound = 100.0;
+            control_setting.input_audio_gain = 0.0;
             control_setting.enable_input_audio = true;
             global_store!(ui).set_setting_control(control_setting.clone());
             global_logic!(ui).invoke_set_setting_control(control_setting);
@@ -210,7 +210,7 @@ fn init_desktop_speaker(ui: &AppWindow) -> Result<()> {
 
             Ok(recorder) => {
                 let amplification = Arc::new(AtomicI32::new(
-                    config::all().control.desktop_speaker_sound.max(0.0) as i32,
+                    config::all().control.desktop_speaker_gain as i32,
                 ));
                 let recorder = recorder.with_amplification(amplification.clone());
 
@@ -415,7 +415,7 @@ fn inner_input_audio_changed(ui: &AppWindow, name: SharedString) -> Result<()> {
     }
 
     let amplification = Arc::new(AtomicI32::new(
-        config::all().control.input_audio_sound.max(0.0) as i32,
+        config::all().control.input_audio_gain as i32,
     ));
 
     let recorder = AudioRecorder::new(Some(1024))?.with_amplification(amplification.clone());
@@ -525,10 +525,10 @@ fn inner_start_recording(ui_weak: Weak<AppWindow>) -> Result<()> {
     .with_remove_cache_files(all_config.recorder.remove_temporary_files)
     .with_audio_device_name(input_audio_name)
     .with_audio_amplification(Arc::new(AtomicI32::new(
-        all_config.control.input_audio_sound as i32,
+        all_config.control.input_audio_gain as i32,
     )))
     .with_speaker_amplification(Arc::new(AtomicI32::new(
-        all_config.control.desktop_speaker_sound as i32,
+        all_config.control.desktop_speaker_gain as i32,
     )))
     .with_fps(all_config.recorder.fps.clone().into())
     .with_resolution(resolution);

wayshot/ui/panel/desktop/home.slint

@@ -211,16 +211,16 @@ component ControlPanel inherits HorizontalLayout {
                             alignment: center;
 
                             input-audio-slider := Slider {
-                                value: Store.setting-control.input-audio-sound;
-                                minimum: 0;
-                                maximum: 300;
+                                value: Store.setting-control.input-audio-gain;
+                                minimum: -20;
+                                maximum: 20;
                                 indicator-size: self.has-hover ? Theme.icon-size * 2 / 3 : 0;
                                 height: Theme.icon-size / 3;
                                 width: root.slider-width;
                                 enabled: Store.setting-control.enable-input-audio && Store.record-status == RecordStatus.Stopped;
 
                                 changed(value) => {
-                                    Store.setting-control.input-audio-sound = self.value;
+                                    Store.setting-control.input-audio-gain = self.value;
                                     Logic.set-setting-control(Store.setting-control);
                                     Logic.input-audio-amplification-changed(self.value);
                                 }
@@ -231,7 +231,7 @@ component ControlPanel inherits HorizontalLayout {
                             alignment: center;
 
                             Label {
-                                text: input-audio-slider.value.to-fixed(0) + "%";
+                                text: input-audio-slider.value.to-fixed(0) + "db";
                                 color: input-audio-slider.enabled ? Theme.primary-text-color : Theme.disabled-color;
                             }
                         }
@@ -297,17 +297,17 @@ component ControlPanel inherits HorizontalLayout {
                         VerticalLayout {
                             alignment: center;
                             desktop-speaker-slider := Slider {
-                                value: Store.setting-control.desktop-speaker-sound;
-                                minimum: 0;
-                                maximum: 100;
+                                value: Store.setting-control.desktop-speaker-gain;
+                                minimum: -20;
+                                maximum: 20;
                                 indicator-size: self.has-hover ? Theme.icon-size * 2 / 3 : 0;
                                 width: root.slider-width;
 
                                 height: Theme.icon-size / 3;
                                 enabled: Store.setting-control.enable-desktop-speaker && Store.record-status == RecordStatus.Stopped;
 
                                 changed(value) => {
-                                    Store.setting-control.desktop-speaker-sound = self.value;
+                                    Store.setting-control.desktop-speaker-gain = self.value;
                                     Logic.set-setting-control(Store.setting-control);
                                     Logic.desktop-speaker-amplification-changed(self.value);
                                 }
@@ -318,7 +318,7 @@ component ControlPanel inherits HorizontalLayout {
                             alignment: center;
 
                             Label {
-                                text: desktop-speaker-slider.value.to-fixed(0) + "%";
+                                text: desktop-speaker-slider.value.to-fixed(0) + "db";
                                 color: desktop-speaker-slider.enabled ? Theme.primary-text-color : Theme.disabled-color;
                             }
                         }

wayshot/ui/store.slint

@@ -87,10 +87,10 @@ export struct SettingControl {
     screen: string,
 
     input-audio: string,
-    input-audio-sound: float,
+    input-audio-gain: float,
     enable-input-audio: bool,
 
-    desktop-speaker-sound: float,
+    desktop-speaker-gain: float,
     enable-desktop-speaker: bool,
  }
 
@@ -190,9 +190,9 @@ export global Store {
     in-out property <SettingControl> setting-control:  {
         screen: sources[1].name,
         input-audio: sources[0].name,
-        input-audio-sound: 10,
+        input-audio-gain: -2,
         enable-input-audio: true,
-        desktop-speaker-sound: 50,
+        desktop-speaker-gain: 2,
         enable-desktop-speaker: true,
     };