Merge branch 'master' into master

Author: midoriiro

.github/workflows/cpal.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Run clippy
       run: cargo clippy --all --all-features
     - name: Run clippy for Android target
-      run: cargo clippy --all --features asio --features oboe/fetch-prebuilt --target armv7-linux-androideabi
+      run: cargo clippy --all --features asio --target armv7-linux-androideabi
 
   rustfmt-check:
     runs-on: ubuntu-latest
@@ -207,15 +207,16 @@ jobs:
       with:
         target: armv7-linux-androideabi
     - name: Check android
-      run: cargo check --example android --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
+      working-directory: examples/android
+      run: cargo check --target armv7-linux-androideabi --verbose
     - name: Check beep
-      run: cargo check --example beep --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
+      run: cargo check --example beep --target armv7-linux-androideabi --verbose
     - name: Check enumerate
-      run: cargo check --example enumerate --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
+      run: cargo check --example enumerate --target armv7-linux-androideabi --verbose
     - name: Check feedback
-      run: cargo check --example feedback --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
+      run: cargo check --example feedback --target armv7-linux-androideabi --verbose
     - name: Check record_wav
-      run: cargo check --example record_wav --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
+      run: cargo check --example record_wav --target armv7-linux-androideabi --verbose
 
   android-apk-build:
     runs-on: ubuntu-latest
@@ -227,11 +228,12 @@ jobs:
         targets: armv7-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android
     - name: Set Up Android tools
       run: |
-        ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-30"
+        ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.2" "platforms;android-30"
     - name: Install Cargo APK
       run: cargo install cargo-apk
     - name: Build APK
-      run: cargo apk build --example android
+      working-directory: examples/android
+      run: cargo apk build
 
   ios-build:
     runs-on: macOS-latest

Cargo.toml

@@ -11,7 +11,6 @@ rust-version = "1.70"
 
 [features]
 asio = ["asio-sys", "num-traits"] # Only available on Windows. See README for setup instructions.
-oboe-shared-stdcxx = ["oboe/shared-stdcxx"] # Only available on Android. See README for what it does.
 jack = ["dep:jack"]
 pipewire = ["dep:pipewire-client", "dep:tokio"]
 
@@ -24,9 +23,6 @@ hound = "3.5"
 ringbuf = "0.4.1"
 clap = { version = "4.0", features = ["derive"] }
 
-[target.'cfg(target_os = "android")'.dev-dependencies]
-ndk-glue = "0.7"
-
 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.54.0", features = [
     "Win32_Media_Audio",
@@ -73,15 +69,11 @@ js-sys = { version = "0.3.35" }
 web-sys = { version = "0.3.35", features = [ "AudioContext", "AudioContextOptions", "AudioBuffer", "AudioBufferSourceNode", "AudioNode",  "AudioDestinationNode", "Window", "AudioContextState"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-oboe = { version = "0.6", features = [ "java-interface" ] }
-ndk = { version = "0.8", default-features = false }
+ndk = { version = "0.9", default-features = false, features = ["audio", "api-level-26"]}
 ndk-context = "0.1"
 jni = "0.21"
-
-[[example]]
-name = "android"
-path = "examples/android.rs"
-crate-type = ["cdylib"]
+num-derive = "0.4"
+num-traits = "0.2"
 
 [[example]]
 name = "beep"

README.md

@@ -20,7 +20,7 @@ Currently, supported hosts include:
 - Windows (via WASAPI by default, see ASIO instructions below)
 - macOS (via CoreAudio)
 - iOS (via CoreAudio)
-- Android (via Oboe)
+- Android (via AAudio)
 - Emscripten
 
 Note that on Linux, the ALSA development files are required. These are provided
@@ -43,10 +43,6 @@ Some audio backends are optional and will only be compiled with a [feature flag]
 - PipeWire (on Linux): `pipewire` (currently in testing, feel free to share your feedback!)
 - ASIO (on Windows): `asio`
 
-Oboe can either use a shared or static runtime. The static runtime is used by default, but activating the
-`oboe-shared-stdcxx` feature makes it use the shared runtime, which requires `libc++_shared.so` from the Android NDK to
-be present during execution.
-
 ## ASIO on Windows
 
 [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) is an audio

examples/android/.gitignore

@@ -0,0 +1,6 @@
+/target
+/Cargo.lock
+.cargo/
+.DS_Store
+recorded.wav
+rls*.log

examples/android/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "android"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+cpal = { path = "../../" }
+anyhow = "1.0"
+ndk-glue = "0.7"
+
+[lib]
+name = "android"
+path = "src/lib.rs"
+crate-type = ["cdylib"]
+
+[package.metadata.android]
+# Specifies the package property of the manifest.
+package = "com.foo.bar"
+
+# Specifies the array of targets to build for.
+build_targets = [ "armv7-linux-androideabi", "aarch64-linux-android", "i686-linux-android", "x86_64-linux-android" ]
+
+# Name for final APK file.
+# Defaults to package name.
+apk_name = "myapp"
+
+[package.metadata.android.sdk]
+min_sdk_version = 26
+target_sdk_version = 30
+max_sdk_version = 29

examples/android/README.md

@@ -0,0 +1,14 @@
+## How to install
+
+```sh
+rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+```
+
+## How to build apk
+
+```sh
+# Builds the project in release mode and places it into a `apk` file.
+cargo apk build --release
+```
+
+more information at: https://github.com/rust-mobile/cargo-apk

examples/android.rs renamed to examples/android/src/lib.rs

@@ -5,7 +5,7 @@ extern crate cpal;
 
 use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    SizedSample,
+    SizedSample, I24,
 };
 use cpal::{FromSample, Sample};
 
@@ -22,7 +22,7 @@ fn main() {
     match config.sample_format() {
         cpal::SampleFormat::I8 => run::<i8>(&device, &config.into()).unwrap(),
         cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()).unwrap(),
-        // cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()).unwrap(),
+        cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()).unwrap(),
         cpal::SampleFormat::I32 => run::<i32>(&device, &config.into()).unwrap(),
         // cpal::SampleFormat::I48 => run::<I48>(&device, &config.into()).unwrap(),
         cpal::SampleFormat::I64 => run::<i64>(&device, &config.into()).unwrap(),

examples/beep.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
 use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    FromSample, Sample, SizedSample,
+    FromSample, Sample, SizedSample, I24,
 };
 
 #[derive(Parser, Debug)]
@@ -118,7 +118,7 @@ fn main() -> anyhow::Result<()> {
     match config.sample_format() {
         cpal::SampleFormat::I8 => run::<i8>(&device, &config.into()),
         cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()),
-        // cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()),
+        cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()),
         cpal::SampleFormat::I32 => run::<i32>(&device, &config.into()),
         // cpal::SampleFormat::I48 => run::<I48>(&device, &config.into()),
         cpal::SampleFormat::I64 => run::<i64>(&device, &config.into()),

examples/synth_tones.rs

@@ -8,7 +8,7 @@ extern crate cpal;
 
 use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
-    SizedSample,
+    SizedSample, I24,
 };
 use cpal::{FromSample, Sample};
 
@@ -98,6 +98,7 @@ where
     match config.sample_format() {
         cpal::SampleFormat::I8 => make_stream::<i8>(&device, &config.into()),
         cpal::SampleFormat::I16 => make_stream::<i16>(&device, &config.into()),
+        cpal::SampleFormat::I24 => make_stream::<I24>(&device, &config.into()),
         cpal::SampleFormat::I32 => make_stream::<i32>(&device, &config.into()),
         cpal::SampleFormat::I64 => make_stream::<i64>(&device, &config.into()),
         cpal::SampleFormat::U8 => make_stream::<u8>(&device, &config.into()),