Upgrade webrtc-audio-processing lib to v1.0

Author: skywhale

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "webrtc-audio-processing-sys/webrtc-audio-processing"]
 	path = webrtc-audio-processing-sys/webrtc-audio-processing
-	url = https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing.git
+	url = https://gitlab.freedesktop.org/skywhale/webrtc-audio-processing.git
+[submodule "webrtc-audio-processing-sys/abseil-cpp"]
+	path = webrtc-audio-processing-sys/abseil-cpp
+	url = https://github.com/abseil/abseil-cpp

Cargo.toml

@@ -20,7 +20,7 @@ bundled = ["webrtc-audio-processing-sys/bundled"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"], optional = true }
-webrtc-audio-processing-sys = { path = "webrtc-audio-processing-sys", version = "0.3.2" }
+webrtc-audio-processing-sys = { path = "webrtc-audio-processing-sys", version = "0.4.0" }
 
 [dev-dependencies]
 portaudio = "0.7"

examples/karaoke.rs

@@ -21,26 +21,17 @@ const SAMPLE_RATE: f64 = 48_000.0;
 const FRAMES_PER_BUFFER: u32 = 480;
 
 fn create_processor(
-    num_capture_channels: i32,
-    num_render_channels: i32,
+    num_capture_channels: usize,
+    num_render_channels: usize,
 ) -> Result<Processor, Error> {
     let mut processor = Processor::new(&InitializationConfig {
         num_capture_channels,
         num_render_channels,
-        ..InitializationConfig::default()
+        sample_rate_hz: SAMPLE_RATE as u32,
     })?;
 
-    // High pass filter is a prerequisite to running echo cancellation.
-    let config = Config {
-        echo_cancellation: Some(EchoCancellation {
-            suppression_level: EchoCancellationSuppressionLevel::Low,
-            stream_delay_ms: Some(0),
-            enable_delay_agnostic: false,
-            enable_extended_filter: false,
-        }),
-        enable_high_pass_filter: true,
-        ..Config::default()
-    };
+    // The default AEC configuration enables HPF, too.
+    let config = Config { echo_canceller: Some(EchoCanceller::default()), ..Config::default() };
     processor.set_config(config);
 
     Ok(processor)
@@ -74,8 +65,8 @@ fn main() -> Result<(), Error> {
     let pa = portaudio::PortAudio::new()?;
 
     let stream_settings = pa.default_duplex_stream_settings(
-        input_channels,
-        output_channels,
+        input_channels as i32,
+        output_channels as i32,
         SAMPLE_RATE,
         FRAMES_PER_BUFFER,
     )?;

examples/simple.rs

@@ -4,25 +4,17 @@ fn main() {
     let config = InitializationConfig {
         num_capture_channels: 2, // Stereo mic input
         num_render_channels: 2,  // Stereo speaker output
-        ..InitializationConfig::default()
+        sample_rate_hz: 48_000,  // The maximum processing rate
     };
 
     let mut ap = Processor::new(&config).unwrap();
 
-    let config = Config {
-        echo_cancellation: Some(EchoCancellation {
-            suppression_level: EchoCancellationSuppressionLevel::High,
-            enable_delay_agnostic: false,
-            enable_extended_filter: false,
-            stream_delay_ms: None,
-        }),
-        ..Config::default()
-    };
+    let config = Config { echo_canceller: Some(EchoCanceller::default()), ..Default::default() };
     ap.set_config(config);
 
     // The render_frame is what is sent to the speakers, and
     // capture_frame is audio captured from a microphone.
-    let (render_frame, capture_frame) = sample_stereo_frames();
+    let (render_frame, capture_frame) = sample_stereo_frames(&ap);
 
     let mut render_frame_output = render_frame.clone();
     ap.process_render_frame(&mut render_frame_output).unwrap();
@@ -43,8 +35,8 @@ fn main() {
 
 /// Generate example stereo frames that simulates a situation where the
 /// microphone (capture) would be picking up the speaker (render) output.
-fn sample_stereo_frames() -> (Vec<f32>, Vec<f32>) {
-    let num_samples_per_frame = NUM_SAMPLES_PER_FRAME as usize;
+fn sample_stereo_frames(processor: &Processor) -> (Vec<f32>, Vec<f32>) {
+    let num_samples_per_frame = processor.num_samples_per_frame();
 
     let mut render_frame = Vec::with_capacity(num_samples_per_frame * 2);
     let mut capture_frame = Vec::with_capacity(num_samples_per_frame * 2);