Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux pipewire integration (Audio + Microphone) #1973

Merged
merged 21 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
RUST_BACKTRACE: 1
run: |
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
echo "deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu $(lsb_release
echo "deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
sudo apt-get update
sudo apt-get install libfuse2 build-essential pkg-config nasm libva-dev libdrm-dev libvulkan-dev libx264-dev libx265-dev cmake libasound2-dev libjack-jackd2-dev libxrandr-dev libunwind-dev libffmpeg-nvenc-dev nvidia-cuda-toolkit libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
cp alvr/xtask/deb/cuda.pc /usr/share/pkgconfig
Expand Down
17 changes: 8 additions & 9 deletions alvr/audio/src/linux.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
use crate::receive_samples_loop;
use alvr_common::{anyhow::Result, debug, error, parking_lot::Mutex};
use alvr_session::AudioBufferingConfig;
use alvr_sockets::{StreamReceiver, StreamSender};
use pipewire::{self as pw, stream::StreamState};
use pw::spa::{
self,
param::audio::{AudioFormat, AudioInfoRaw},
pod::{self, serialize::PodSerializer, Pod},
use pw::{
spa::{
self,
param::audio::{AudioFormat, AudioInfoRaw},
pod::{self, serialize::PodSerializer, Pod},
},
stream::{StreamFlags, StreamListener},
};
use pw::stream::{StreamFlags, StreamListener};
Meister1593 marked this conversation as resolved.
Show resolved Hide resolved
use std::{cmp, collections::VecDeque, sync::Arc, thread};
struct Terminate;

Expand Down Expand Up @@ -61,7 +62,7 @@ pub fn play_microphone_loop_pipewire(
}
};
let receive_samples_buffer_arc = Arc::clone(&receive_samples_buffer_arc);
receive_samples_loop(
crate::receive_samples_loop(
stream_audio,
receiver,
receive_samples_buffer_arc,
Expand Down Expand Up @@ -139,7 +140,6 @@ fn pw_microphone_loop(

let datas = pw_buffer.datas_mut();
if datas.is_empty() {
debug!("Pw buffer empty, skipping process");
return;
}

Expand Down Expand Up @@ -287,7 +287,6 @@ fn pw_audio_loop(
Some(mut pw_buffer) => {
let datas = pw_buffer.datas_mut();
if datas.is_empty() {
debug!("Pw buffer empty, skipping process");
return;
}

Expand Down
16 changes: 6 additions & 10 deletions alvr/dashboard/src/dashboard/components/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,12 @@ impl SettingsTab {
resolution_preset: PresetControl::new(builtin_schema::resolution_schema()),
framerate_preset: PresetControl::new(builtin_schema::framerate_schema()),
encoder_preset: PresetControl::new(builtin_schema::encoder_preset_schema()),
game_audio_preset: if cfg!(target_os = "linux") {
Some(PresetControl::new(builtin_schema::linux_game_audio_schema()))
} else {
None
},
microphone_preset: if cfg!(target_os = "linux") {
Some(PresetControl::new(builtin_schema::linux_microphone_schema()))
} else {
None
},
game_audio_preset: cfg!(target_os = "linux")
.then(|| PresetControl::new(builtin_schema::linux_game_audio_schema()))
.or_else(|| None),
microphone_preset: cfg!(target_os = "linux")
.then(|| PresetControl::new(builtin_schema::linux_microphone_schema()))
.or_else(|| None),
Meister1593 marked this conversation as resolved.
Show resolved Hide resolved
eye_face_tracking_preset: PresetControl::new(builtin_schema::eye_face_tracking_schema()),
top_level_entries,
session_settings_json: None,
Expand Down
3 changes: 3 additions & 0 deletions alvr/server/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ fn connection_pipeline(
continue;
}
};

#[cfg(windows)]
if let Ok(id) = alvr_audio::get_windows_device_id(&device) {
ctx.events_queue
Expand All @@ -733,6 +734,7 @@ fn connection_pipeline(
} else {
continue;
};

if let Err(e) = alvr_audio::record_audio_blocking(
Arc::new({
let client_hostname = client_hostname.clone();
Expand All @@ -745,6 +747,7 @@ fn connection_pipeline(
) {
error!("Audio record error: {e:?}");
}

#[cfg(windows)]
if let Ok(id) = AudioDevice::new_output(None)
.and_then(|d| alvr_audio::get_windows_device_id(&d))
Expand Down
Loading