diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-06-30 15:44:07 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-06-30 16:07:32 +0300 |
commit | 51c7d0652e27d1dd2ae1f88bd5dbba67c2e151ff (patch) | |
tree | d207b32c6732fb6e2c524b94bbb8b7a0dbeb8eff /net/onvif/src | |
parent | a45f944edda5c111159eab0915bccbeeaa60b556 (diff) |
Fix/silence a couple new clippy warnings
Diffstat (limited to 'net/onvif/src')
-rw-r--r-- | net/onvif/src/onvifoverlay/imp.rs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/net/onvif/src/onvifoverlay/imp.rs b/net/onvif/src/onvifoverlay/imp.rs index f68fa722..a73cf261 100644 --- a/net/onvif/src/onvifoverlay/imp.rs +++ b/net/onvif/src/onvifoverlay/imp.rs @@ -73,17 +73,20 @@ pub struct OnvifOverlay { impl OnvifOverlay { fn negotiate(&self, element: &super::OnvifOverlay) -> Result<gst::FlowSuccess, gst::FlowError> { - let video_info = match self.state.lock().unwrap().video_info.as_ref() { - Some(video_info) => Ok(video_info.clone()), - None => { - gst::element_error!( - element, - gst::CoreError::Negotiation, - ["Element hasn't received valid video caps at negotiation time"] - ); - Err(gst::FlowError::NotNegotiated) - } - }?; + let video_info = { + let state = self.state.lock().unwrap(); + match state.video_info.as_ref() { + Some(video_info) => Ok(video_info.clone()), + None => { + gst::element_error!( + element, + gst::CoreError::Negotiation, + ["Element hasn't received valid video caps at negotiation time"] + ); + Err(gst::FlowError::NotNegotiated) + } + }? + }; let mut caps = video_info.to_caps().unwrap(); let mut downstream_accepts_meta = false; |