52c138e36e
This reverts commit 84524e6b196153e35910111f61c36489ec2bd1d7. Reason for revert: https://webrtc-review.googlesource.com/c/src/+/160649/33#message-a83e8959e03a274642ca2ce1abb9ea0099f08097 + suspected in breaking WebRTC to Chromium rolls https://chromium-review.googlesource.com/c/chromium/src/+/2468139 Original change's description: > Improve screen sharing with PipeWire on Wayland > > Currently, sharing a screen or a window on Wayland opens unnecessary > preview dialog on Chromium side, which is then followed by a similar > dialog on xdg-desktop-portal side. The Chromium dialog is useless on > Wayland, as it doesn't show anything. This is because Chromium doesn't > have access to screen content as in case of X11 session. To fix this, we > want to avoid showing the preview dialog in case we find that we run on > Wayland and only pick a screen or a window from the dialog that comes > from xdg-desktop-portal. > > This patch splits BaseCapturerPipeWire class, moving portal related code > into XdgPortalBase, which does all the DBus communication and which is > supposed to be reused by BaseCapturerPipeWire when the user confirms > the dialog from xdg-desktop-portal. The XdgPortalBase is extended to > support multiple calls at once, where each call is identified by Id. > > Relevant change on Chromium side will be in a different review. > > Bug: chromium:682122 > Change-Id: I2bcd07d16a5eb3b902db63ea9a164c5bd39c23a0 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187492 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: Tommi <tommi@webrtc.org> > Commit-Queue: Tommi <tommi@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32388} TBR=mbonadei@webrtc.org,tommi@webrtc.org,sprang@webrtc.org,guidou@webrtc.org,mfoltz@chromium.org,grulja@gmail.com Change-Id: I1a9748ced5626903b12214d677c7b8919c2ac385 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:682122 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188380 Reviewed-by: Olga Sharonova <olka@webrtc.org> Commit-Queue: Olga Sharonova <olka@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32398}
45 lines
1.9 KiB
Plaintext
45 lines
1.9 KiB
Plaintext
// Copyright 2018 The WebRTC project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
//------------------------------------------------
|
|
// Functions from PipeWire used in capturer code.
|
|
//------------------------------------------------
|
|
|
|
// core.h
|
|
void pw_core_destroy(pw_core *core);
|
|
pw_type *pw_core_get_type(pw_core *core);
|
|
pw_core * pw_core_new(pw_loop *main_loop, pw_properties *props);
|
|
|
|
// loop.h
|
|
void pw_loop_destroy(pw_loop *loop);
|
|
pw_loop * pw_loop_new(pw_properties *properties);
|
|
|
|
// pipewire.h
|
|
void pw_init(int *argc, char **argv[]);
|
|
|
|
// properties.h
|
|
pw_properties * pw_properties_new_string(const char *args);
|
|
|
|
// remote.h
|
|
void pw_remote_add_listener(pw_remote *remote, spa_hook *listener, const pw_remote_events *events, void *data);
|
|
int pw_remote_connect_fd(pw_remote *remote, int fd);
|
|
void pw_remote_destroy(pw_remote *remote);
|
|
pw_remote * pw_remote_new(pw_core *core, pw_properties *properties, size_t user_data_size);
|
|
|
|
// stream.h
|
|
void pw_stream_add_listener(pw_stream *stream, spa_hook *listener, const pw_stream_events *events, void *data);
|
|
int pw_stream_connect(pw_stream *stream, enum pw_direction direction, const char *port_path, enum pw_stream_flags flags, const spa_pod **params, uint32_t n_params);
|
|
pw_buffer *pw_stream_dequeue_buffer(pw_stream *stream);
|
|
void pw_stream_destroy(pw_stream *stream);
|
|
void pw_stream_finish_format(pw_stream *stream, int res, const spa_pod **params, uint32_t n_params);
|
|
pw_stream * pw_stream_new(pw_remote *remote, const char *name, pw_properties *props);
|
|
int pw_stream_queue_buffer(pw_stream *stream, pw_buffer *buffer);
|
|
int pw_stream_set_active(pw_stream *stream, bool active);
|
|
|
|
// thread-loop.h
|
|
void pw_thread_loop_destroy(pw_thread_loop *loop);
|
|
pw_thread_loop * pw_thread_loop_new(pw_loop *loop, const char *name);
|
|
int pw_thread_loop_start(pw_thread_loop *loop);
|
|
void pw_thread_loop_stop(pw_thread_loop *loop);
|