Use libwebrtc's DesktopCapturer for screen capture

This adds support for screen sharing on Wayland (fixes #28754).

libwebrtc replaces scap, which aims to be cross platform but was
only used on Windows and X11. The X11 support relied on an out-of-tree
branch on which the original author closed their own pull request
(CapSoftware/scap#124). This also replaces
Zed's platform-specific code on macOS. Switching to a single
cross platform library simplifies the code by removing the need
for Zed to have its own traits for cross platform abstraction.

Author: Be-ing

Cargo.lock

@@ -462,7 +462,7 @@ async-recursion = "1.0.0"
 async-tar = "0.5.1"
 async-task = "4.7"
 async-trait = "0.1"
-async-tungstenite = "0.31.0"
+async-tungstenite = "0.32.0"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 aws-config = { version = "1.6.1", features = ["behavior-version-latest"] }
 aws-credential-types = { version = "1.2.2", features = [
@@ -542,6 +542,10 @@ jupyter-websocket-client = "0.15.0"
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
+libwebrtc = { branch = "zed", git = "https://github.com/Be-ing/rust-sdks" }
+livekit = { branch = "zed", git = "https://github.com/Be-ing/rust-sdks", features = [
+    "__rustls-tls"
+] }
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "b71ab4eeb27d9758be8092020a46fe33fbca4e33" }
 mach2 = "0.5"
@@ -629,8 +633,6 @@ rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
-# WARNING: If you change this, you must also publish a new version of zed-scap to crates.io
-scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
 schemars = { version = "1.0", features = ["indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0.221", features = ["derive", "rc"] }
@@ -674,7 +676,7 @@ time = { version = "0.3", features = [
 ] }
 tiny_http = "0.8"
 tokio = { version = "1" }
-tokio-tungstenite = { version = "0.26", features = ["__rustls-tls"] }
+tokio-tungstenite = { version = "0.28", features = ["__rustls-tls"] }
 toml = "0.8"
 toml_edit = { version = "0.22", default-features = false, features = ["display", "parse", "serde"] }
 tower-http = "0.4.4"
@@ -783,7 +785,6 @@ features = [
 [patch.crates-io]
 notify = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
 notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "b4588b2e5aee68f4c0e100f140e808cbce7b1419" }
-windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }
 
 [profile.dev]
 split-debuginfo = "unpacked"

Cargo.toml

@@ -29,4 +29,4 @@ thiserror.workspace = true
 util.workspace = true
 
 [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
+libwebrtc = { workspace = true }

crates/audio/Cargo.toml

@@ -30,8 +30,9 @@ collections.workspace = true
 fs.workspace = true
 futures.workspace = true
 feature_flags.workspace = true
-gpui = { workspace = true, features = ["screen-capture"] }
+gpui.workspace = true
 language.workspace = true
+libwebrtc.workspace = true
 log.workspace = true
 postage.workspace = true
 project.workspace = true

crates/call/Cargo.toml

@@ -13,13 +13,14 @@ use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
 use futures::StreamExt;
 use gpui::{
-    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FutureExt as _,
-    ScreenCaptureSource, ScreenCaptureStream, Task, Timeout, WeakEntity,
+    App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, FutureExt as _, Task, Timeout,
+    WeakEntity,
 };
 use gpui_tokio::Tokio;
 use language::LanguageRegistry;
+use libwebrtc::desktop_capturer::CaptureSource;
 use livekit::{LocalTrackPublication, ParticipantIdentity, RoomEvent};
-use livekit_client::{self as livekit, AudioStream, TrackSid};
+use livekit_client::{self as livekit, AudioStream, ScreenCaptureStreamHandle, TrackSid};
 use postage::{sink::Sink, stream::Stream, watch};
 use project::Project;
 use settings::Settings as _;
@@ -1267,9 +1268,7 @@ impl Room {
 
     pub fn shared_screen_id(&self) -> Option<u64> {
         self.live_kit.as_ref().and_then(|lk| match lk.screen_track {
-            LocalTrack::Published { ref _stream, .. } => {
-                _stream.metadata().ok().map(|meta| meta.id)
-            }
+            LocalTrack::Published { ref _stream, .. } => Some(_stream.screen_id),
             _ => None,
         })
     }
@@ -1398,7 +1397,7 @@ impl Room {
 
     pub fn share_screen(
         &mut self,
-        source: Rc<dyn ScreenCaptureSource>,
+        source: CaptureSource,
         cx: &mut Context<Self>,
     ) -> Task<Result<()>> {
         if self.status.is_offline() {
@@ -1418,7 +1417,7 @@ impl Room {
         };
 
         cx.spawn(async move |this, cx| {
-            let publication = participant.publish_screenshare_track(&*source, cx).await;
+            let publication = participant.publish_screenshare_track(source, cx).await;
 
             this.update(cx, |this, cx| {
                 let live_kit = this
@@ -1445,7 +1444,7 @@ impl Room {
                         } else {
                             live_kit.screen_track = LocalTrack::Published {
                                 track_publication: publication,
-                                _stream: stream,
+                                _stream: Box::new(stream),
                             };
                             cx.notify();
                         }
@@ -1644,7 +1643,7 @@ fn spawn_room_connection(
 
 struct LiveKitRoom {
     room: Rc<livekit::Room>,
-    screen_track: LocalTrack<dyn ScreenCaptureStream>,
+    screen_track: LocalTrack<ScreenCaptureStreamHandle>,
     microphone_track: LocalTrack<AudioStream>,
     /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
     muted_by_user: bool,

crates/call/src/call_impl/room.rs

@@ -41,6 +41,7 @@ futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
 log.workspace = true
+livekit_client.workspace = true
 menu.workspace = true
 notifications.workspace = true
 picker.workspace = true

crates/collab_ui/Cargo.toml

@@ -19,6 +19,7 @@ use gpui::{
     Render, SharedString, Styled, Subscription, Task, TextStyle, WeakEntity, Window, actions,
     anchored, canvas, deferred, div, fill, list, point, prelude::*, px,
 };
+use livekit_client::screen_capture_sources;
 use menu::{Cancel, Confirm, SecondaryConfirm, SelectNext, SelectPrevious};
 use project::{Fs, Project};
 use rpc::{
@@ -152,10 +153,8 @@ pub fn init(cx: &mut App) {
                         if room.is_sharing_screen() {
                             room.unshare_screen(true, cx).ok();
                         } else {
-                            let sources = cx.screen_capture_sources();
-
+                            let sources = screen_capture_sources();
                             cx.spawn(async move |room, cx| {
-                                let sources = sources.await??;
                                 let first = sources.into_iter().next();
                                 if let Some(first) = first {
                                     room.update(cx, |room, cx| room.share_screen(first, cx))?

crates/collab_ui/src/collab_panel.rs

@@ -73,10 +73,6 @@ x11 = [
     "x11-clipboard",
     "filedescriptor",
     "open",
-    "scap?/x11",
-]
-screen-capture = [
-    "scap",
 ]
 windows-manifest = []
 
@@ -164,9 +160,6 @@ metal.workspace = true
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
 pathfinder_geometry = "0.5"
 
-[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
-scap = { workspace = true, optional = true }
-
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 # Always used
 flume = "0.11"

crates/gpui/Cargo.toml

@@ -40,8 +40,8 @@ use crate::{
     Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
     PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, Point, PromptBuilder,
     PromptButton, PromptHandle, PromptLevel, Render, RenderImage, RenderablePromptHandle,
-    Reservation, ScreenCaptureSource, SharedString, SubscriberSet, Subscription, SvgRenderer, Task,
-    TextSystem, Window, WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
+    Reservation, SharedString, SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, Window,
+    WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
     colors::{Colors, GlobalColors},
     current_platform, hash, init_app_menus,
 };
@@ -1026,18 +1026,6 @@ impl App {
         self.platform.primary_display()
     }
 
-    /// Returns whether `screen_capture_sources` may work.
-    pub fn is_screen_capture_supported(&self) -> bool {
-        self.platform.is_screen_capture_supported()
-    }
-
-    /// Returns a list of available screen capture sources.
-    pub fn screen_capture_sources(
-        &self,
-    ) -> oneshot::Receiver<Result<Vec<Rc<dyn ScreenCaptureSource>>>> {
-        self.platform.screen_capture_sources()
-    }
-
     /// Returns the display with the given ID, if one exists.
     pub fn find_display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
         self.displays()

crates/gpui/src/app.rs

@@ -3,9 +3,8 @@ use crate::{
     BackgroundExecutor, BorrowAppContext, Bounds, Capslock, ClipboardItem, DrawPhase, Drawable,
     Element, Empty, EventEmitter, ForegroundExecutor, Global, InputEvent, Keystroke, Modifiers,
     ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels,
-    Platform, Point, Render, Result, Size, Task, TestDispatcher, TestPlatform,
-    TestScreenCaptureSource, TestWindow, TextSystem, VisualContext, Window, WindowBounds,
-    WindowHandle, WindowOptions,
+    Platform, Point, Render, Result, Size, Task, TestDispatcher, TestPlatform, TestWindow,
+    TextSystem, VisualContext, Window, WindowBounds, WindowHandle, WindowOptions,
 };
 use anyhow::{anyhow, bail};
 use futures::{Stream, StreamExt, channel::oneshot};
@@ -340,12 +339,6 @@ impl TestAppContext {
         rx
     }
 
-    /// Causes the given sources to be returned if the application queries for screen
-    /// capture sources.
-    pub fn set_screen_capture_sources(&self, sources: Vec<TestScreenCaptureSource>) {
-        self.test_platform.set_screen_capture_sources(sources);
-    }
-
     /// Returns all windows open in the test.
     pub fn windows(&self) -> Vec<AnyWindowHandle> {
         self.app.borrow().windows()