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.

Sign up for GitHub

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

Linux pipewire integration (Audio + Microphone) #1973

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6659cf5
Linux pipewire implementation
Meister1593 Apr 6, 2024
f605151
Add pipewire libs to release
Meister1593 Jul 3, 2024
781bff4
Remove wrong client name
Meister1593 Jul 3, 2024
f03be94
Clippy fixes
Meister1593 Jul 3, 2024
4612699
Type annotated to any on game audio sender
Meister1593 Jul 3, 2024
83e27b5
Attempt to fix macos type infer
Meister1593 Jul 3, 2024
49ba47c
Revert "Attempt to fix macos type infer"
Meister1593 Jul 3, 2024
c8a1623
Check clippy compile
Meister1593 Jul 3, 2024
165c1e7
Revert "Check clippy compile"
Meister1593 Jul 3, 2024
6ada407
Fix macos clippy
Meister1593 Jul 3, 2024
396d567
Nullify infer
Meister1593 Jul 3, 2024
7112771
PR review fixes
Meister1593 Jul 3, 2024
a4aab08
PR review fix #2
Meister1593 Jul 3, 2024
7801d17
PR review fixes #2
Meister1593 Jul 3, 2024
5213307
Missed cfg for windows
Meister1593 Jul 3, 2024
2ab89fe
Remove -
Meister1593 Jul 3, 2024
eecc8cb
PR review fixes. Fixed prepare release pipeline
Meister1593 Jul 6, 2024
8d014c9
Adjust wiki for building with libpipewire/libspa
Meister1593 Jul 6, 2024
812961c
Remove unnecessary log
Meister1593 Jul 6, 2024
7c69c7d
PR review
Meister1593 Jul 6, 2024
eea2f38
Fix default audio config
Meister1593 Jul 6, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/prepare-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,10 @@ jobs:
env:
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
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
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
cargo xtask prepare-deps --platform linux

Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ jobs:
env:
RUST_BACKTRACE: 1
run: |
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
Meister1593 marked this conversation as resolved.
Show resolved Hide resolved
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 update
sudo apt install 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 libgtk-3-dev
sudo apt install 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 libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
cargo xtask prepare-deps --platform linux --no-nvidia

- uses: actions-rs/clippy-check@v1
Expand Down Expand Up @@ -133,8 +135,10 @@ jobs:
env:
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 -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
sudo apt update
sudo apt install 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 libgtk-3-dev
sudo apt install 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 libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
cargo xtask prepare-deps --platform linux --no-nvidia

- name: Run tests
Expand Down Expand Up @@ -188,8 +192,10 @@ jobs:
env:
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 -cs) main" | sudo tee -a /etc/apt/sources.list.d/pipewire-upstream.list
sudo apt update
sudo apt install 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 libgtk-3-dev
sudo apt install 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 libgtk-3-dev libpipewire-0.3-dev libspa-0.2-dev
cargo xtask prepare-deps --platform linux --no-nvidia

- run: cargo xtask check-msrv
200 changes: 197 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions alvr/audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@ windows = { version = "0.56", features = [
"Win32_System_Variant",
"Win32_UI_Shell_PropertiesSystem",
] }

[target.'cfg(target_os = "linux")'.dependencies]
pipewire = { version = "0.8.0", features = ["v0_3_49"] }
libspa-sys = "0.8.0"
Loading
Loading