Expose new unsafe audio dump API to rust.

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, windows-2019, macos-14]
         rust: [stable]
         experimental: [false]
         include:
@@ -19,7 +19,7 @@ jobs:
           - os: windows-2019
             rust: nightly
             experimental: true
-          - os: macos-10.15
+          - os: macos-14
             rust: nightly
             experimental: true
 
@@ -44,6 +44,20 @@ jobs:
       shell: bash
       run: rustup run ${{ matrix.rust }} cargo build --all
 
+    - name: Setup Audio
+      if: ${{ matrix.os == 'macos-14' }}
+      run: |
+        brew install switchaudio-osx
+        brew install blackhole-2ch
+        SwitchAudioSource -s "BlackHole 2ch" -t input
+        SwitchAudioSource -s "BlackHole 2ch" -t output
+
+    - name: Grant microphone access
+      if: ${{ matrix.os == 'macos-14' }}
+      env:
+        tcc_extra_columns: ${{ matrix.os == 'macos-14' && ',NULL,NULL,''UNUSED'',1687786159' || '' }}
+      run: sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159${{ env.tcc_extra_columns }});"
+
     - name: Test
       shell: bash
       run: rustup run ${{ matrix.rust }} cargo test --all

cubeb-api/src/sample.rs

@@ -13,7 +13,7 @@ pub trait Sample: Send + Copy {
 
 impl Sample for i16 {
     fn from_float(x: f32) -> i16 {
-        (x * f32::from(i16::max_value())) as i16
+        (x * f32::from(i16::MAX)) as i16
     }
 }
 

cubeb-backend/src/traits.rs

@@ -24,7 +24,7 @@ pub trait ContextOps {
         collection: &DeviceCollectionRef,
     ) -> Result<()>;
     fn device_collection_destroy(&mut self, collection: &mut DeviceCollectionRef) -> Result<()>;
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))]
+    #[allow(clippy::too_many_arguments)]
     fn stream_init(
         &mut self,
         stream_name: Option<&CStr>,

cubeb-core/Cargo.toml

@@ -19,4 +19,4 @@ gecko-in-tree = ["cubeb-sys/gecko-in-tree"]
 
 [dependencies]
 bitflags = "1.2.0"
-cubeb-sys = { path = "../cubeb-sys", version = "0.12.0" }
+cubeb-sys = { path = "../cubeb-sys" }

cubeb-core/src/builders.rs

@@ -6,7 +6,6 @@
 use ffi;
 use {ChannelLayout, SampleFormat, StreamParams, StreamPrefs};
 
-///
 #[derive(Debug)]
 pub struct StreamParamsBuilder(ffi::cubeb_stream_params);
 

cubeb-core/src/context.rs

@@ -95,7 +95,7 @@ impl ContextRef {
     ///
     /// This function is unsafe because it dereferences the given `data_callback`, `state_callback`, and `user_ptr` pointers.
     /// The caller should ensure those pointers are valid.
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::too_many_arguments))]
+    #[allow(clippy::too_many_arguments)]
     pub unsafe fn stream_init(
         &self,
         stream_name: Option<&CStr>,

cubeb-sys/src/audio_dump.rs

@@ -0,0 +1,35 @@
+// Copyright © 2017-2023 Mozilla Foundation
+//
+// This program is made available under an ISC-style license.  See the
+// accompanying file LICENSE for details.
+
+use std::os::raw::{c_char, c_int, c_void};
+use stream::cubeb_stream_params;
+
+pub enum cubeb_audio_dump_stream {}
+pub enum cubeb_audio_dump_session {}
+pub type cubeb_audio_dump_stream_t = *mut cubeb_audio_dump_stream;
+pub type cubeb_audio_dump_session_t = *mut cubeb_audio_dump_session;
+
+extern "C" {
+    pub fn cubeb_audio_dump_init(session: *mut cubeb_audio_dump_session_t) -> c_int;
+    pub fn cubeb_audio_dump_shutdown(session: cubeb_audio_dump_session_t) -> c_int;
+    pub fn cubeb_audio_dump_stream_init(
+        session: cubeb_audio_dump_session_t,
+        stream: *mut cubeb_audio_dump_stream_t,
+        stream_params: cubeb_stream_params,
+        name: *const c_char,
+    ) -> c_int;
+    pub fn cubeb_audio_dump_stream_shutdown(
+        session: cubeb_audio_dump_session_t,
+        stream: cubeb_audio_dump_stream_t,
+    ) -> c_int;
+    pub fn cubeb_audio_dump_start(session: cubeb_audio_dump_session_t) -> c_int;
+    pub fn cubeb_audio_dump_stop(session: cubeb_audio_dump_session_t) -> c_int;
+    pub fn cubeb_audio_dump_write(
+        stream: cubeb_audio_dump_stream_t,
+        audio_samples: *mut c_void,
+        count: u32,
+    ) -> c_int;
+
+}

cubeb-sys/src/lib.rs

@@ -8,6 +8,7 @@
 #[macro_use]
 mod macros;
 
+mod audio_dump;
 mod callbacks;
 mod channel;
 mod context;
@@ -19,6 +20,7 @@ mod mixer;
 mod resampler;
 mod stream;
 
+pub use audio_dump::*;
 pub use callbacks::*;
 pub use channel::*;
 pub use context::*;

systest/build.rs

@@ -12,7 +12,8 @@ fn main() {
     cfg.header("cubeb.h")
         .header("cubeb_mixer.h")
         .header("cubeb_resampler.h")
-        .header("cubeb_log.h");
+        .header("cubeb_log.h")
+        .header("cubeb_audio_dump.h");
 
     // Include the directory where the header files are defined
     cfg.include(root.join("include"))