diff options
| author | Seungha Yang <seungha@centricular.com> | 2023-11-08 19:45:51 +0300 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2023-11-15 12:17:39 +0300 |
| commit | 8a04a38631479578520eef18363dd1161e3dcb2a (patch) | |
| tree | 18466f4a9e617a979d31180edd566b469a3a2524 /utils | |
| parent | 9250c592a7408cd25a65ca916745d953f396af03 (diff) | |
fallbacksrc: Fix timeout scheduling
Other thread can schedule the timeout (e.g., unblock signal
or active pad change) while state lock is released
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1384>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/fallbackswitch/src/fallbacksrc/imp.rs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/utils/fallbackswitch/src/fallbacksrc/imp.rs b/utils/fallbackswitch/src/fallbacksrc/imp.rs index 9b4a7c17b..f1e51e137 100644 --- a/utils/fallbackswitch/src/fallbacksrc/imp.rs +++ b/utils/fallbackswitch/src/fallbacksrc/imp.rs @@ -3206,20 +3206,23 @@ impl FallbackSrc { } else { let mut state_guard = imp.state.lock(); let state = state_guard.as_mut().expect("no state"); - if fallback_source { - assert!(state - .fallback_source - .as_ref() - .map(|s| s.restart_timeout.is_none()) - .unwrap_or(true)); + let source = if fallback_source { + if let Some(source) = &state.fallback_source { + source + } else { + return; + } } else { - assert!(state.source.restart_timeout.is_none()); + &state.source + }; + + if source.restart_timeout.is_none() { + imp.schedule_source_restart_timeout( + state, + gst::ClockTime::ZERO, + fallback_source, + ); } - imp.schedule_source_restart_timeout( - state, - gst::ClockTime::ZERO, - fallback_source, - ); } }); }) |