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-09-27 06:20:03 +00:00
Code Issues Projects Releases Wiki Activity

threadshare/jitterbuffer: fix a race condition when stopping

Browse source 
Don't hold the `state` while stopping as the task might attempt to
lock it before reaching an `await` point.
This commit is contained in:
François Laignel 2020-03-27 19:35:25 +01:00
parent bb6ec76951
commit 89682aa6a8
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
View file

@ -661,11 +661,8 @@ impl PadSinkHandler for SinkHandler {
gst_log!(CAT, obj: pad.gst_pad(), "Handling {:?}", event); gst_log!(CAT, obj: pad.gst_pad(), "Handling {:?}", event);
match event.view() { if let EventView::FlushStart(..) = event.view() {
EventView::FlushStart(..) => { jb.src_pad.cancel_task();
jb.src_pad.cancel_task();
}
_ => (),
} }
gst_log!(CAT, obj: pad.gst_pad(), "Forwarding {:?}", event); gst_log!(CAT, obj: pad.gst_pad(), "Forwarding {:?}", event);
@ -1310,11 +1307,9 @@ impl JitterBuffer {
} }
fn start(&self, element: &gst::Element) { fn start(&self, element: &gst::Element) {
let mut state = self.state.lock().unwrap();
gst_debug!(CAT, obj: element, "Starting"); gst_debug!(CAT, obj: element, "Starting");
*state = State::default(); *self.state.lock().unwrap() = State::default();
self.sink_pad_handler.clear(); self.sink_pad_handler.clear();
self.src_pad_handler.clear(); self.src_pad_handler.clear();
@ -1325,10 +1320,9 @@ impl JitterBuffer {
} }
fn stop(&self, element: &gst::Element) { fn stop(&self, element: &gst::Element) {
let mut state = self.state.lock().unwrap();
gst_debug!(CAT, obj: element, "Stopping"); gst_debug!(CAT, obj: element, "Stopping");
if let Some((_, abort_handle)) = state.wait_handle.take() { if let Some((_, abort_handle)) = self.state.lock().unwrap().wait_handle.take() {
abort_handle.abort(); abort_handle.abort();
} }
@ -1336,7 +1330,7 @@ impl JitterBuffer {
self.src_pad_handler.clear(); self.src_pad_handler.clear();
self.sink_pad_handler.clear(); self.sink_pad_handler.clear();
*state = State::default(); *self.state.lock().unwrap() = State::default();
gst_debug!(CAT, obj: element, "Stopped"); gst_debug!(CAT, obj: element, "Stopped");
} }