Skip to content

feat: offer both screens and windows in the Wayland portal picker #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
B077AS wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: offer both screens and windows in the Wayland portal picker #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions webrtc-jni/src/main/cpp/src/media/video/VideoTrackDesktopSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,19 +266,28 @@ namespace jni
options.set_prefer_cursor_embedded(true);
#endif

std::unique_ptr<webrtc::DesktopCapturer> capturer;
std::unique_ptr<webrtc::DesktopCapturer> inner;

if (sourceIsWindow) {
capturer.reset(new webrtc::DesktopAndCursorComposer(
webrtc::DesktopCapturer::CreateWindowCapturer(options),
options));
}
else {
capturer.reset(new webrtc::DesktopAndCursorComposer(
webrtc::DesktopCapturer::CreateScreenCapturer(options),
options));
#if defined(WEBRTC_USE_PIPEWIRE)
// Wayland: request "any screen content" so the xdg-desktop-portal picker
// offers both monitors and application windows in a single dialog (the
// same CaptureType::kAnyScreenContent Chromium uses for getDisplayMedia).
// CreateGenericCapturer returns null when not running under Wayland or
// when PipeWire is disallowed, in which case we fall back to the
// type-specific capturers below. The portal handles the actual source
// selection, so sourceIsWindow is irrelevant on this path.
inner = webrtc::DesktopCapturer::CreateGenericCapturer(options);
#endif

if (!inner) {
inner = sourceIsWindow
? webrtc::DesktopCapturer::CreateWindowCapturer(options)
: webrtc::DesktopCapturer::CreateScreenCapturer(options);
}

std::unique_ptr<webrtc::DesktopCapturer> capturer;
capturer.reset(new webrtc::DesktopAndCursorComposer(std::move(inner), options));

if (!capturer->SelectSource(sourceId)) {
terminate();
return;
Expand Down