mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-12-23 02:26:35 +00:00
Code Issues Projects Releases Wiki Activity

webrtcsink: fix panic on pre-bwe request error

Browse source 
We dispose of consumer pipelines asynchronously, potentially after the
session objects have been disposed of.

As session objects are the owner of the cc element, it is entirely
possible for the bwe-request signal to get emitted after cc has been
disposed of, as the closure only takes a weak reference to it.

Fix by simply checking if cc is None

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1044>
This commit is contained in:
Mathieu Duponchelle 2023-01-11 16:04:45 +01:00 committed by GStreamer Marge Bot
parent 0201f5a456
commit 1a8abde884
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
net/webrtc/src/webrtcsink/imp.rs
View file

@ -1443,26 +1443,26 @@ impl WebRTCSink {
false, false,
glib::closure!(@watch element, @strong session_id, @weak-allow-none cc glib::closure!(@watch element, @strong session_id, @weak-allow-none cc
=> move |_webrtcbin: gst::Element, _transport: gst::Object| { => move |_webrtcbin: gst::Element, _transport: gst::Object| {
if let Some(ref cc) = cc {
let settings = element.imp().settings.lock().unwrap();
let cc = cc.unwrap(); // TODO: Bind properties with @element's
let settings = element.imp().settings.lock().unwrap(); cc.set_properties(&[
("min-bitrate", &settings.cc_info.min_bitrate),
("estimated-bitrate", &settings.cc_info.start_bitrate),
("max-bitrate", &settings.cc_info.max_bitrate),
]);
// TODO: Bind properties with @element's cc.connect_notify(Some("estimated-bitrate"),
cc.set_properties(&[ glib::clone!(@weak element, @strong session_id
("min-bitrate", &settings.cc_info.min_bitrate), => move |bwe, pspec| {
("estimated-bitrate", &settings.cc_info.start_bitrate), element.imp().set_bitrate(&element, &session_id,
("max-bitrate", &settings.cc_info.max_bitrate), bwe.property::<u32>(pspec.name()));
]); }
));
}
cc.connect_notify(Some("estimated-bitrate"), cc
glib::clone!(@weak element, @strong session_id
=> move |bwe, pspec| {
element.imp().set_bitrate(&element, &session_id,
bwe.property::<u32>(pspec.name()));
}
));
Some(cc)
}), }),
); );