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-05-20 09:18:15 +00:00
Code Issues Projects Releases Wiki Activity

webrtc: signaller iface: fix session-ended vs end-session confusion

Browse source 
Session ending is bidirectional: the signaller can tell the sink that a
session was ended, and the sink can tell the signaller to end a session.

As such, two signals are needed, before this patch the second case was
not working as in essence the sink was telling itself that a session was
ended, and obviously failing to even find it when trying to end it again.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1167>
This commit is contained in:
Mathieu Duponchelle 2023-04-08 01:28:31 +02:00 committed by Sebastian Dröge
parent 0b5cf4e5fd
commit 58c8c0edc7
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/plugins/gst_plugins_cache.json
View file

@ -6494,6 +6494,16 @@
"return-type": "void",
"when": "last"
},
"end-session": {
"args": [
{
"name": "arg0",
"type": "gchararray"
}
],
"return-type": "gboolean",
"when": "last"
},
"error": {
"args": [
{

55
net/webrtc/src/signaller/iface.rs
View file

@ -61,30 +61,8 @@ unsafe impl prelude::ObjectInterface for Signallable {
* Notify the underlying webrtc object that a session has ended.
*/
Signal::builder("session-ended")
.flags(glib::SignalFlags::ACTION)
.param_types([str::static_type()])
// in order to have an accumulator actually do something, we need to have a
// return value (glib limitation). Use a dummy bool for this purpose.
.return_type::<bool>()
.class_handler(|_token, args| {
let this = args[0usize]
.get::<&super::Signallable>()
.unwrap_or_else(|e| {
panic!("Wrong type for argument {}: {:?}", 0usize, e)
});
let session_id = args[1usize].get::<&str>().unwrap_or_else(|e| {
panic!("Wrong type for argument {}: {:?}", 1usize, e)
});
let vtable = this.interface::<super::Signallable>().unwrap();
let vtable = vtable.as_ref();
(vtable.end_session)(this, session_id);
Some(false.into())
})
.accumulator(move |_hint, output, input| {
*output = input.clone();
false
})
.build(),
/**
* GstRSWebRTCSignallableIface::producer-added:
@ -258,6 +236,37 @@ unsafe impl prelude::ObjectInterface for Signallable {
Signal::builder("shutdown")
.flags(glib::SignalFlags::ACTION)
.build(),
/**
* GstRSWebRTCSignallableIface::end-session:
* @self: The object implementing #GstRSWebRTCSignallableIface
* @session-id: The ID of the session that should be ended
*
* Notify the signaller that a session should be ended.
*/
Signal::builder("end-session")
.run_last()
.param_types([str::static_type()])
.return_type::<bool>()
.class_handler(|_tokens, args| {
let this = args[0usize]
.get::<&super::Signallable>()
.unwrap_or_else(|e| {
panic!("Wrong type for argument {}: {:?}", 0usize, e)
});
let session_id = args[1usize].get::<&str>().unwrap_or_else(|e| {
panic!("Wrong type for argument {}: {:?}", 1usize, e)
});
let vtable = this.interface::<super::Signallable>().unwrap();
let vtable = vtable.as_ref();
(vtable.end_session)(this, session_id);
Some(false.into())
})
.accumulator(move |_hint, output, input| {
*output = input.clone();
false
})
.build(),
/**
* GstRSWebRTCSignallableIface::consumer-added:
* @self: The object implementing #GstRSWebRTCSignallableIface
@ -497,6 +506,6 @@ impl<Obj: glib::IsA<super::Signallable>> SignallableExt for Obj {
}
fn end_session(&self, session_id: &str) {
self.emit_by_name::<bool>("session-ended", &[&session_id]);
self.emit_by_name::<bool>("end-session", &[&session_id]);
}
}