From bc65445af44a335a0586a393c792614330258249 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 12 Jun 2021 02:30:01 +0200 Subject: simplify audio output infrastructure --- mumd/src/audio.rs | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 63adcc6..67d91c9 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -3,9 +3,6 @@ mod noise_gate; pub mod output; use crate::audio::input::{AudioInputDevice, DefaultAudioInputDevice}; -use crate::audio::noise_gate::{ - from_interleaved_samples_stream, OpusEncoder, StreamingNoiseGate, StreamingSignalExt, -}; use crate::audio::output::{AudioOutputDevice, ClientStream, DefaultAudioOutputDevice}; use crate::error::AudioError; use crate::network::VoiceStreamType; @@ -81,27 +78,19 @@ impl AudioInput { input_volume: f32, phase_watcher: watch::Receiver, ) -> Result { - let mut default = DefaultAudioInputDevice::new(input_volume, phase_watcher)?; + let mut default = DefaultAudioInputDevice::new(input_volume, phase_watcher, 4)?; let sample_rate = SampleRate(SAMPLE_RATE); - let opus_stream = OpusEncoder::new( - 4, - sample_rate.0, - default.num_channels(), - StreamingSignalExt::into_interleaved_samples(StreamingNoiseGate::new( - from_interleaved_samples_stream::<_, f32>(default.sample_receiver()), //TODO group frames correctly - 10_000, - )), - ) - .enumerate() - .map(|(i, e)| VoicePacket::Audio { - _dst: std::marker::PhantomData, - target: 0, // normal speech - session_id: (), // unused for server-bound packets - seq_num: i as u64, - payload: VoicePacketPayload::Opus(e.into(), false), - position_info: None, - }); + let opus_stream = default.sample_receiver().unwrap() + .enumerate() + .map(|(i, e)| VoicePacket::Audio { + _dst: std::marker::PhantomData, + target: 0, // normal speech + session_id: (), // unused for server-bound packets + seq_num: i as u64, + payload: VoicePacketPayload::Opus(e.into(), false), + position_info: None, + }); default.play()?; -- cgit v1.2.1 From 62be7e8d5f22888d95984ce2634f676ca8b055c4 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 12 Jun 2021 02:32:13 +0200 Subject: remove empty file 2 electric boogaloo --- mumd/src/audio.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 67d91c9..6264879 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -1,5 +1,4 @@ pub mod input; -mod noise_gate; pub mod output; use crate::audio::input::{AudioInputDevice, DefaultAudioInputDevice}; -- cgit v1.2.1 From 3cb2c612fb030278aaf5e4d49d42cf689bdc9cc0 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 12 Jun 2021 15:58:44 +0200 Subject: re-add noise gate --- mumd/src/audio.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 6264879..29c5668 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -1,5 +1,6 @@ pub mod input; pub mod output; +pub mod transformers; use crate::audio::input::{AudioInputDevice, DefaultAudioInputDevice}; use crate::audio::output::{AudioOutputDevice, ClientStream, DefaultAudioOutputDevice}; -- cgit v1.2.1 From 09cf98857e39d75ed6034259a6fefe48e5998a71 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 12 Jun 2021 17:09:15 +0200 Subject: lift inits one level --- mumd/src/audio.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 29c5668..8ddf377 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -79,7 +79,6 @@ impl AudioInput { phase_watcher: watch::Receiver, ) -> Result { let mut default = DefaultAudioInputDevice::new(input_volume, phase_watcher, 4)?; - let sample_rate = SampleRate(SAMPLE_RATE); let opus_stream = default.sample_receiver().unwrap() .enumerate() -- cgit v1.2.1 From 200dbfe0d2707a718debf4c26d66da718d16449b Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Sat, 12 Jun 2021 17:10:53 +0200 Subject: resolve warnings --- mumd/src/audio.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 8ddf377..97f0963 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -8,7 +8,6 @@ use crate::error::AudioError; use crate::network::VoiceStreamType; use crate::state::StatePhase; -use cpal::SampleRate; use dasp_interpolate::linear::Linear; use dasp_signal::{self as signal, Signal}; use futures_util::stream::Stream; -- cgit v1.2.1 From 9481f3edb37d44957273a8b856ac823d2b5b5f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kapten=20Z=E2=88=85=E2=88=85m?= <55669224+default-username-852@users.noreply.github.com> Date: Sun, 13 Jun 2021 12:06:34 +0200 Subject: Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gustav Sörnäs --- mumd/src/audio.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mumd/src/audio.rs') diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 97f0963..2e20583 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -79,7 +79,9 @@ impl AudioInput { ) -> Result { let mut default = DefaultAudioInputDevice::new(input_volume, phase_watcher, 4)?; - let opus_stream = default.sample_receiver().unwrap() + let opus_stream = default + .sample_receiver() + .unwrap() .enumerate() .map(|(i, e)| VoicePacket::Audio { _dst: std::marker::PhantomData, -- cgit v1.2.1