Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Enable gain normalization on collab (#58036)
Conrad Irwin5fba9b0cba14
diff --git a/Cargo.lock b/Cargo.lockindex 4280c59d56f..677ed3796ed 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2163,7 +2163,7 @@ dependencies = ["bitflags 2.10.0","cexpr","clang-sys",- "itertools 0.11.0",+ "itertools 0.10.5","log","prettyplease","proc-macro2",@@ -2183,7 +2183,7 @@ dependencies = ["bitflags 2.10.0","cexpr","clang-sys",- "itertools 0.11.0",+ "itertools 0.10.5","proc-macro2","quote","regex",@@ -5313,7 +5313,7 @@ dependencies = ["libc","option-ext","redox_users 0.5.2",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -6148,7 +6148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -7604,7 +7604,7 @@ dependencies = ["gobject-sys","libc","system-deps",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -9065,7 +9065,7 @@ dependencies = ["libc","percent-encoding","pin-project-lite",- "socket2 0.6.3",+ "socket2 0.5.10","tokio","tower-service","tracing",@@ -9083,7 +9083,7 @@ dependencies = ["js-sys","log","wasm-bindgen",- "windows-core 0.62.2",+ "windows-core 0.56.0",][[package]]@@ -9337,7 +9337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"dependencies = ["equivalent",- "hashbrown 0.16.1",+ "hashbrown 0.15.5","serde","serde_core",]@@ -10480,7 +10480,7 @@ dependencies = [[[package]]name = "libwebrtc"version = "0.3.26"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["cxx","glib",@@ -10590,7 +10590,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"[[package]]name = "livekit"version = "0.7.32"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["base64 0.22.1","bmrng",@@ -10616,7 +10616,7 @@ dependencies = [[[package]]name = "livekit-api"version = "0.4.14"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["base64 0.21.7","futures-util",@@ -10643,7 +10643,7 @@ dependencies = [[[package]]name = "livekit-protocol"version = "0.7.1"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["futures-util","livekit-runtime",@@ -10659,7 +10659,7 @@ dependencies = [[[package]]name = "livekit-runtime"version = "0.4.0"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["tokio","tokio-stream",@@ -11951,7 +11951,7 @@ version = "0.50.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -14590,7 +14590,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"dependencies = ["bytes 1.11.1","heck 0.5.0",- "itertools 0.11.0",+ "itertools 0.10.5","log","multimap","once_cell",@@ -14623,7 +14623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"dependencies = ["anyhow",- "itertools 0.11.0",+ "itertools 0.10.5","proc-macro2","quote","syn 2.0.117",@@ -14885,7 +14885,7 @@ dependencies = ["quinn-udp","rustc-hash 2.1.1","rustls 0.23.40",- "socket2 0.6.3",+ "socket2 0.5.10","thiserror 2.0.17","tokio","tracing",@@ -14922,9 +14922,9 @@ dependencies = ["cfg_aliases 0.2.1","libc","once_cell",- "socket2 0.6.3",+ "socket2 0.5.10","tracing",- "windows-sys 0.60.2",+ "windows-sys 0.59.0",][[package]]@@ -16149,7 +16149,7 @@ dependencies = ["errno 0.3.14","libc","linux-raw-sys 0.11.0",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -18771,7 +18771,7 @@ dependencies = ["getrandom 0.3.4","once_cell","rustix 1.1.2",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -19696,7 +19696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "2fb391ac70462b3097a755618fbf9c8f95ecc1eb379a414f7b46f202ed10db1f"dependencies = ["cc",- "windows-targets 0.52.6",+ "windows-targets 0.48.5",][[package]]@@ -21489,7 +21489,7 @@ dependencies = [[[package]]name = "webrtc-sys"version = "0.3.23"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["cc","cxx",@@ -21503,7 +21503,7 @@ dependencies = [[[package]]name = "webrtc-sys-build"version = "0.3.13"-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1#147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1"+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=c3a55bbc207008f1ca3474b6037fdd3c443cad0f#c3a55bbc207008f1ca3474b6037fdd3c443cad0f"dependencies = ["anyhow","fs2",@@ -21801,7 +21801,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.48.0",][[package]]diff --git a/Cargo.toml b/Cargo.tomlindex 7a8d87fca3b..883e0e04486 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -891,9 +891,9 @@ notify = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cnotify-types = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }calloop = { git = "https://github.com/zed-industries/calloop" }-livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1" }-libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1" }-webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "147fbca3d4b592d96d33f5e6a84b59fc0b5d9bf1" }+livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }+libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }+webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }[profile.dev]split-debuginfo = "unpacked"diff --git a/crates/audio/src/audio_pipeline/echo_canceller.rs b/crates/audio/src/audio_pipeline/echo_canceller.rsindex ec612b1b448..59f3063d9fc 100644--- a/crates/audio/src/audio_pipeline/echo_canceller.rs+++ b/crates/audio/src/audio_pipeline/echo_canceller.rs@@ -12,9 +12,12 @@ mod real_implementation {impl Default for EchoCanceller {fn default() -> Self {- Self(Arc::new(Mutex::new(apm::AudioProcessingModule::new(- true, false, false, false,- ))))+ // Sound-effect playback only feeds this APM through `process_reverse_stream`+ // for AEC reference; gain/HPF/NS would be no-ops here, so we keep the+ // original (echo only) configuration via the legacy flag form.+ Self(Arc::new(Mutex::new(+ apm::AudioProcessingModule::from_flags(true, false, false, false),+ )))}}diff --git a/crates/livekit_client/src/livekit_client/playback.rs b/crates/livekit_client/src/livekit_client/playback.rsindex cea5b1169b0..8a72b5df40e 100644--- a/crates/livekit_client/src/livekit_client/playback.rs+++ b/crates/livekit_client/src/livekit_client/playback.rs@@ -49,8 +49,27 @@ pub(crate) struct AudioStack {impl AudioStack {pub(crate) fn new(executor: BackgroundExecutor) -> Self {+ // AGC2's `adaptive_digital` is what actually levels speech toward a target;+ // the `gain_controller2.enabled` master switch alone leaves it off, which+ // historically meant capture was effectively unleveled. Defaults match+ // what Chrome/Meet ship with -- in particular `max_gain_db = 50` paired+ // with `max_output_noise_level_dbfs = -50`, which lets the AGC reach+ // very quiet talkers while the noise-level estimator backs off before+ // boosting amplifies the noise floor.let apm = Arc::new(Mutex::new(apm::AudioProcessingModule::new(- true, true, true, true,+ apm::AudioProcessingConfig {+ echo_canceller_enabled: true,+ gain_controller2: apm::GainController2Config {+ enabled: true,+ adaptive_digital: apm::AdaptiveDigitalConfig {+ enabled: true,+ ..Default::default()+ },+ ..Default::default()+ },+ high_pass_filter_enabled: true,+ noise_suppression_enabled: true,+ },)));let mixer = Arc::new(Mutex::new(audio_mixer::AudioMixer::new()));Self {