mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-12-23 10:30:40 +00:00
webrtcsrc: use @watch instead of @to-owned
@to-owned increases refcount of the element, which prevents the object from proper destruction, as the initial refcount with ElementFactory::make is larger than 1. Instead, use @watch to create a weak reference and unbind the closure automatically if the object gets destroyed Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1355>
This commit is contained in:
parent
3fc6220009
commit
5b03f7d7b0
1 changed files with 17 additions and 16 deletions
|
@ -555,6 +555,8 @@ impl WebRTCSrc {
|
|||
}
|
||||
|
||||
fn connect_signaller(&self, signaller: &Signallable) {
|
||||
let instance = &*self.obj();
|
||||
|
||||
let _ = self
|
||||
.state
|
||||
.lock()
|
||||
|
@ -564,10 +566,10 @@ impl WebRTCSrc {
|
|||
error: signaller.connect_closure(
|
||||
"error",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |
|
||||
glib::closure!(@watch instance => move |
|
||||
_signaller: glib::Object, error: String| {
|
||||
gst::element_error!(
|
||||
this.obj(),
|
||||
instance,
|
||||
gst::StreamError::Failed,
|
||||
["Signalling error: {}", error]
|
||||
);
|
||||
|
@ -577,12 +579,13 @@ impl WebRTCSrc {
|
|||
session_started: signaller.connect_closure(
|
||||
"session-started",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |
|
||||
glib::closure!(@watch instance => move |
|
||||
_signaller: glib::Object,
|
||||
session_id: &str,
|
||||
_peer_id: &str| {
|
||||
gst::info!(CAT, imp: this, "Session started: {session_id}");
|
||||
this.state.lock().unwrap().session_id =
|
||||
let imp = instance.imp();
|
||||
gst::info!(CAT, imp: imp, "Session started: {session_id}");
|
||||
imp.state.lock().unwrap().session_id =
|
||||
Some(session_id.to_string());
|
||||
}),
|
||||
),
|
||||
|
@ -590,9 +593,9 @@ impl WebRTCSrc {
|
|||
session_ended: signaller.connect_closure(
|
||||
"session-ended",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |_signaler: glib::Object, _session_id: &str|{
|
||||
this.state.lock().unwrap().session_id = None;
|
||||
this.obj().iterate_src_pads().into_iter().for_each(|pad|
|
||||
glib::closure!(@watch instance => move |_signaler: glib::Object, _session_id: &str|{
|
||||
instance.imp().state.lock().unwrap().session_id = None;
|
||||
instance.iterate_src_pads().into_iter().for_each(|pad|
|
||||
{ if let Err(e) = pad.map(|pad| pad.push_event(gst::event::Eos::new())) {
|
||||
gst::error!(CAT, "Could not send EOS: {e:?}");
|
||||
}}
|
||||
|
@ -605,24 +608,22 @@ impl WebRTCSrc {
|
|||
request_meta: signaller.connect_closure(
|
||||
"request-meta",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |
|
||||
glib::closure!(@watch instance => move |
|
||||
_signaller: glib::Object| -> Option<gst::Structure> {
|
||||
let meta = this.settings.lock().unwrap().meta.clone();
|
||||
|
||||
meta
|
||||
instance.imp().settings.lock().unwrap().meta.clone()
|
||||
}),
|
||||
),
|
||||
|
||||
session_description: signaller.connect_closure(
|
||||
"session-description",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |
|
||||
glib::closure!(@watch instance => move |
|
||||
_signaller: glib::Object,
|
||||
_peer_id: &str,
|
||||
desc: &gst_webrtc::WebRTCSessionDescription| {
|
||||
assert_eq!(desc.type_(), gst_webrtc::WebRTCSDPType::Offer);
|
||||
|
||||
this.handle_offer(desc);
|
||||
instance.imp().handle_offer(desc);
|
||||
}),
|
||||
),
|
||||
|
||||
|
@ -632,13 +633,13 @@ impl WebRTCSrc {
|
|||
handle_ice: signaller.connect_closure(
|
||||
"handle-ice",
|
||||
false,
|
||||
glib::closure!(@to-owned self as this => move |
|
||||
glib::closure!(@watch instance => move |
|
||||
_signaller: glib::Object,
|
||||
peer_id: &str,
|
||||
sdp_m_line_index: u32,
|
||||
_sdp_mid: Option<String>,
|
||||
candidate: &str| {
|
||||
this.handle_ice(peer_id, Some(sdp_m_line_index), None, candidate);
|
||||
instance.imp().handle_ice(peer_id, Some(sdp_m_line_index), None, candidate);
|
||||
}),
|
||||
),
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue