593b4d550d
The documentation for `OpenPipeWireRemote()` says: > Open a file descriptor to the PipeWire remote where the camera nodes > are available. The file descriptor should be used to create a > pw_core object, by using pw_context_connect_fd. In `InitPipeWire()` we already successfully requested the FD, but then went on and used the unrestricted default socket. This does not matter in non-sandboxed environments, as the stream we want to use is available from both FDs. In flatpak sandboxes, however, this requires to give full Pipewire access to the application. Fix this by simply using the right, restricted FD, and while on it, also make sure to not leak it. This change has already landed in downstream in Firefox, see https://phabricator.services.mozilla.com/D122904 https://phabricator.services.mozilla.com/D124508 Bug: webrtc:13152 Change-Id: I3f8995c54c797e1a90a980f231e496a13cbe65b4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230803 Reviewed-by: Joe Downing <joedow@chromium.org> Commit-Queue: Joe Downing <joedow@chromium.org> Cr-Commit-Position: refs/heads/main@{#34983}
48 lines
2.0 KiB
Plaintext
48 lines
2.0 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
|
|
int pw_core_disconnect(pw_core *core);
|
|
|
|
// loop.h
|
|
void pw_loop_destroy(pw_loop *loop);
|
|
pw_loop * pw_loop_new(const spa_dict *props);
|
|
|
|
|
|
// pipewire.h
|
|
void pw_init(int *argc, char **argv[]);
|
|
|
|
// properties.h
|
|
pw_properties * pw_properties_new_string(const char *args);
|
|
|
|
// 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, uint32_t target_id, 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);
|
|
pw_stream * pw_stream_new(pw_core *core, 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);
|
|
int pw_stream_update_params(pw_stream *stream, const spa_pod **params, uint32_t n_params);
|
|
|
|
// thread-loop.h
|
|
void pw_thread_loop_destroy(pw_thread_loop *loop);
|
|
pw_thread_loop * pw_thread_loop_new(const char *name, const spa_dict *props);
|
|
int pw_thread_loop_start(pw_thread_loop *loop);
|
|
void pw_thread_loop_stop(pw_thread_loop *loop);
|
|
void pw_thread_loop_lock(pw_thread_loop *loop);
|
|
void pw_thread_loop_unlock(pw_thread_loop *loop);
|
|
pw_loop * pw_thread_loop_get_loop(pw_thread_loop *loop);
|
|
|
|
|
|
// context.h
|
|
void pw_context_destroy(pw_context *context);
|
|
pw_context *pw_context_new(pw_loop *main_loop, pw_properties *props, size_t user_data_size);
|
|
pw_core * pw_context_connect(pw_context *context, pw_properties *properties, size_t user_data_size);
|
|
pw_core * pw_context_connect_fd(pw_context *context, int fd, pw_properties *properties, size_t user_data_size);
|