Merge pull request #93 from wiiznokes/amplify

teamclouday · web-flow · commit 97071b2ea07b · 2025-08-17T05:59:58.000+08:00
add an amplify option
diff --git a/RustApp/i18n/en/android_mic.ftl b/RustApp/i18n/en/android_mic.ftl
@@ -16,6 +16,7 @@ denoise = Use audio noise reduction
 start_at_login = Start at login
 auto_connect = Auto connect
 theme = Theme
+amplify = Amplify
 
 about = About
 repository = Repository
diff --git a/RustApp/justfile b/RustApp/justfile
@@ -59,3 +59,7 @@ prettier:
 
 metainfo-check:
     appstreamcli validate --pedantic --explain --strict res/linux/metainfo.xml
+
+install_nsis: build-release nsis
+    Start-Process (Get-ChildItem .\target\release\android-mic_*_x64-setup.exe | Sort-Object LastWriteTime -Descending | Select-Object -First 1).FullName
+
diff --git a/RustApp/src/audio/process.rs b/RustApp/src/audio/process.rs
@@ -10,6 +10,7 @@ use super::{
 pub struct AudioProcessParams {
     pub target_format: AudioPacketFormat,
     pub denoise: bool,
+    pub amplify: Option<f32>,
 }
 
 // This function converts an audio stream from packet into producer
@@ -63,7 +64,7 @@ where
     const DENOISE_SAMPLE_RATE: u32 = 48000;
 
     // next run resampler and denoise on the buffer
-    let resampled_buffer = if config.denoise {
+    let mut resampled_buffer = if config.denoise {
         let prepared_buffer = if packet.sample_rate == DENOISE_SAMPLE_RATE {
             buffer
         } else {
@@ -88,6 +89,14 @@ where
         resample_f32_stream(&buffer, packet.sample_rate, format.sample_rate.to_number())?
     };
 
+    if let Some(amplify) = config.amplify {
+        for channel in &mut resampled_buffer {
+            for v in channel {
+                *v *= amplify;
+            }
+        }
+    }
+
     // finally convert to output format
     let num_channels = format.channel_count.to_number() as usize;
     let total_bytes: usize = resampled_buffer[0].len() * num_channels * std::mem::size_of::<F>();
diff --git a/RustApp/src/config.rs b/RustApp/src/config.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::fl;
 
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(default)]
 pub struct Config {
     pub connection_mode: ConnectionMode,
@@ -22,6 +22,43 @@ pub struct Config {
     pub auto_connect: bool,
     pub denoise: bool,
     pub theme: AppTheme,
+    pub amplify: bool,
+    pub amplify_value: f32,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            connection_mode: Default::default(),
+            ip: Default::default(),
+            audio_format: Default::default(),
+            channel_count: Default::default(),
+            sample_rate: Default::default(),
+            device_name: Default::default(),
+            start_at_login: Default::default(),
+            auto_connect: Default::default(),
+            denoise: Default::default(),
+            theme: Default::default(),
+            amplify: Default::default(),
+            amplify_value: 2.0,
+        }
+    }
+}
+
+pub struct ConfigCache {
+    pub amplify_value: String,
+}
+
+impl ConfigCache {
+    pub fn new(config: &Config) -> Self {
+        Self {
+            amplify_value: config.amplify_value.to_string(),
+        }
+    }
+
+    pub fn parse_amplify_value(&self) -> Option<f32> {
+        self.amplify_value.replace(',', ".").parse().ok()
+    }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq, Values)]
diff --git a/RustApp/src/streamer/mod.rs b/RustApp/src/streamer/mod.rs
@@ -39,6 +39,7 @@ pub struct StreamConfig {
     pub buff: Producer<u8>,
     pub audio_config: AudioPacketFormat,
     pub denoise: bool,
+    pub amplify: Option<f32>,
 }
 
 impl Debug for StreamConfig {
@@ -55,6 +56,7 @@ impl StreamConfig {
         AudioProcessParams {
             target_format: self.audio_config.clone(),
             denoise: self.denoise,
+            amplify: self.amplify,
         }
     }
 }
diff --git a/RustApp/src/ui/app.rs b/RustApp/src/ui/app.rs
@@ -26,7 +26,9 @@ use super::{
 };
 use crate::{
     audio::AudioPacketFormat,
-    config::{AppTheme, AudioFormat, ChannelCount, Config, ConnectionMode, SampleRate},
+    config::{
+        AppTheme, AudioFormat, ChannelCount, Config, ConfigCache, ConnectionMode, SampleRate,
+    },
     fl,
     streamer::{self, ConnectOption, StreamConfig, StreamerCommand, StreamerMsg},
     ui::view::{SCROLLABLE_ID, about_window},
@@ -115,6 +117,7 @@ pub struct AppState {
     core: Core,
     pub streamer: Option<Sender<StreamerCommand>>,
     pub config: ConfigManager<Config>,
+    pub config_cache: ConfigCache,
     pub audio_host: Host,
     pub audio_devices: Vec<AudioDevice>,
     pub audio_device: Option<cpal::Device>,
@@ -142,13 +145,15 @@ impl AppState {
             return Task::none();
         }
         let (producer, consumer) = RingBuffer::<u8>::new(self.get_shared_buf_size());
+        let config = self.config.data().clone();
 
         match self.start_audio_stream(consumer) {
             Ok(audio_config) => {
                 self.send_command(StreamerCommand::ReconfigureStream(StreamConfig {
                     buff: producer,
                     audio_config,
-                    denoise: self.config.data().denoise,
+                    denoise: config.denoise,
+                    amplify: config.amplify.then_some(config.amplify_value),
                 }));
                 Task::none()
             }
@@ -209,7 +214,8 @@ impl AppState {
             StreamConfig {
                 buff: producer,
                 audio_config,
-                denoise: self.config.data().denoise,
+                denoise: config.denoise,
+                amplify: config.amplify.then_some(config.amplify_value),
             },
         ));
 
@@ -294,6 +300,7 @@ impl Application for AppState {
             core,
             audio_stream: None,
             streamer: None,
+            config_cache: ConfigCache::new(flags.config.data()),
             config: flags.config,
             audio_device,
             audio_host,
@@ -455,7 +462,6 @@ impl Application for AppState {
                 }
                 ConfigMsg::DeNoise(denoise) => {
                     self.config.update(|c| c.denoise = denoise);
-                    info!("set denoise: {denoise}");
                     return self.update_audio_stream();
                 }
                 ConfigMsg::Theme(app_theme) => {
@@ -488,6 +494,18 @@ impl Application for AppState {
                             .chain(set_window_title);
                     }
                 },
+                ConfigMsg::Amplify(amplify) => {
+                    self.config.update(|c| c.amplify = amplify);
+                    return self.update_audio_stream();
+                }
+                ConfigMsg::AmplifyValue(amplify_value) => {
+                    self.config_cache.amplify_value = amplify_value;
+
+                    if let Some(value) = self.config_cache.parse_amplify_value() {
+                        self.config.update(|c| c.amplify_value = value);
+                        return self.update_audio_stream();
+                    }
+                }
             },
             AppMsg::Shutdown => {
                 return cosmic::iced_runtime::task::effect(Action::Exit);
diff --git a/RustApp/src/ui/message.rs b/RustApp/src/ui/message.rs
@@ -29,6 +29,8 @@ pub enum ConfigMsg {
     AutoConnect(bool),
     DeNoise(bool),
     Theme(AppTheme),
+    Amplify(bool),
+    AmplifyValue(String),
     ToggleAboutWindow,
 }
 
diff --git a/RustApp/src/ui/view.rs b/RustApp/src/ui/view.rs
@@ -5,7 +5,7 @@ use cosmic::{
     iced::{Length, alignment::Horizontal, widget::pick_list},
     widget::{
         self, about::About, button, canvas, column, container, context_menu, markdown, menu, radio,
-        row, scrollable, settings, text, toggler, vertical_space,
+        row, scrollable, settings, text, text_input, toggler, vertical_space,
     },
 };
 use cpal::traits::DeviceTrait;
@@ -208,6 +208,24 @@ pub fn settings_window(app: &AppState) -> Element<'_, ConfigMsg> {
                     .title(fl!("denoise"))
                     .add(toggler(config.denoise).on_toggle(ConfigMsg::DeNoise)),
             )
+            .push(
+                settings::section()
+                    .title(fl!("amplify"))
+                    .add(toggler(config.amplify).on_toggle(ConfigMsg::Amplify))
+                    .add({
+                        let mut text = text_input("", &app.config_cache.amplify_value);
+
+                        if config.amplify {
+                            text = text.on_input(ConfigMsg::AmplifyValue)
+                        }
+
+                        if app.config_cache.parse_amplify_value().is_none() {
+                            text = text.error("")
+                        }
+
+                        text
+                    }),
+            )
             .push(button::text("Use Recommended Format").on_press(ConfigMsg::UseRecommendedFormat))
             .push_maybe(if cfg!(target_os = "windows") {
                 Some(

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ pub struct StreamConfig {`
`39`	`39`	`pub buff: Producer<u8>,`
`40`	`40`	`pub audio_config: AudioPacketFormat,`
`41`	`41`	`pub denoise: bool,`
	`42`	`+ pub amplify: Option<f32>,`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`impl Debug for StreamConfig {`
`@@ -55,6 +56,7 @@ impl StreamConfig {`
`55`	`56`	`AudioProcessParams {`
`56`	`57`	`target_format: self.audio_config.clone(),`
`57`	`58`	`denoise: self.denoise,`
	`59`	`+ amplify: self.amplify,`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ pub enum ConfigMsg {`
`29`	`29`	`AutoConnect(bool),`
`30`	`30`	`DeNoise(bool),`
`31`	`31`	`Theme(AppTheme),`
	`32`	`+ Amplify(bool),`
	`33`	`+ AmplifyValue(String),`
`32`	`34`	`ToggleAboutWindow,`
`33`	`35`	`}`
`34`	`36`