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

togglerecord: Don't hold any mutexes while adding/removing pads

Browse source 
Otherwise something might easily deadlock if the application is doing
something from the pad-added/pad-removed signals.
This commit is contained in:
Sebastian Dröge 2019-07-03 18:43:58 +03:00
parent 11bd909bf1
commit ecbf7097de
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst-plugin-togglerecord/Cargo.toml
View file

@ -5,6 +5,7 @@ authors = ["Sebastian Dröge <sebastian@centricular.com>"]
license = "LGPL-2.1+" license = "LGPL-2.1+"
description = "Toggle Record Plugin" description = "Toggle Record Plugin"
repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
edition = "2018"
[dependencies] [dependencies]
glib = { git = "https://github.com/gtk-rs/glib", features = ["subclassing"] } glib = { git = "https://github.com/gtk-rs/glib", features = ["subclassing"] }

28
gst-plugin-togglerecord/src/togglerecord.rs
View file

@ -1342,8 +1342,8 @@ impl ElementImpl for ToggleRecord {
_name: Option<String>, _name: Option<String>,
_caps: Option<&gst::Caps>, _caps: Option<&gst::Caps>,
) -> Option<gst::Pad> { ) -> Option<gst::Pad> {
let mut other_streams = self.other_streams.lock(); let mut other_streams_guard = self.other_streams.lock();
let (ref mut other_streams, ref mut pad_count) = *other_streams; let (ref mut other_streams, ref mut pad_count) = *other_streams_guard;
let mut pads = self.pads.lock(); let mut pads = self.pads.lock();
let id = *pad_count; let id = *pad_count;
@ -1360,22 +1360,25 @@ impl ElementImpl for ToggleRecord {
sinkpad.set_active(true).unwrap(); sinkpad.set_active(true).unwrap();
srcpad.set_active(true).unwrap(); srcpad.set_active(true).unwrap();
element.add_pad(&sinkpad).unwrap(); let stream = Stream::new(sinkpad.clone(), srcpad.clone());
element.add_pad(&srcpad).unwrap();
let stream = Stream::new(sinkpad.clone(), srcpad);
pads.insert(stream.sinkpad.clone(), stream.clone()); pads.insert(stream.sinkpad.clone(), stream.clone());
pads.insert(stream.srcpad.clone(), stream.clone()); pads.insert(stream.srcpad.clone(), stream.clone());
other_streams.push(stream); other_streams.push(stream);
drop(pads);
drop(other_streams_guard);
element.add_pad(&sinkpad).unwrap();
element.add_pad(&srcpad).unwrap();
Some(sinkpad) Some(sinkpad)
} }
fn release_pad(&self, element: &gst::Element, pad: &gst::Pad) { fn release_pad(&self, element: &gst::Element, pad: &gst::Pad) {
let mut other_streams = self.other_streams.lock(); let mut other_streams_guard = self.other_streams.lock();
let (ref mut other_streams, _) = *other_streams; let (ref mut other_streams, _) = *other_streams_guard;
let mut pads = self.pads.lock(); let mut pads = self.pads.lock();
let stream = match pads.get(pad) { let stream = match pads.get(pad) {
@ -1386,15 +1389,18 @@ impl ElementImpl for ToggleRecord {
stream.srcpad.set_active(false).unwrap(); stream.srcpad.set_active(false).unwrap();
stream.sinkpad.set_active(false).unwrap(); stream.sinkpad.set_active(false).unwrap();
element.remove_pad(&stream.sinkpad).unwrap();
element.remove_pad(&stream.srcpad).unwrap();
pads.remove(&stream.sinkpad).unwrap(); pads.remove(&stream.sinkpad).unwrap();
pads.remove(&stream.srcpad).unwrap(); pads.remove(&stream.srcpad).unwrap();
// TODO: Replace with Vec::remove_item() once stable // TODO: Replace with Vec::remove_item() once stable
let pos = other_streams.iter().position(|x| *x == stream); let pos = other_streams.iter().position(|x| *x == stream);
pos.map(|pos| other_streams.swap_remove(pos)); pos.map(|pos| other_streams.swap_remove(pos));
drop(pads);
drop(other_streams_guard);
element.remove_pad(&stream.sinkpad).unwrap();
element.remove_pad(&stream.srcpad).unwrap();
} }
} }