diff options
author | Taruntej Kanakamalla <taruntej@asymptotic.io> | 2023-08-14 09:41:57 +0300 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-11-17 21:08:44 +0300 |
commit | ed3aa740bedf2cf308d91d89b017071af34260a2 (patch) | |
tree | 8d8ca68a54980c22cfc566a9c74af9247e661ec1 /net | |
parent | 2d3d03b4d3660b85a24a51bb39facb589f142719 (diff) |
net/webrtc: deprecate consumer-added on the signaller
add a new signal webrtcbin-ready in this place doing same
thing but can be used for both consumers and producers
Please note this change is only to the consumer-added
signal on the signaller interface.
The consumer-added signal on the webrtcsink is unchanged
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1284>
Diffstat (limited to 'net')
-rw-r--r-- | net/webrtc/src/aws_kvs_signaller/imp.rs | 2 | ||||
-rw-r--r-- | net/webrtc/src/livekit_signaller/imp.rs | 2 | ||||
-rw-r--r-- | net/webrtc/src/signaller/iface.rs | 15 | ||||
-rw-r--r-- | net/webrtc/src/webrtcsink/imp.rs | 1 | ||||
-rw-r--r-- | net/webrtc/src/whip_signaller/imp.rs | 2 |
5 files changed, 19 insertions, 3 deletions
diff --git a/net/webrtc/src/aws_kvs_signaller/imp.rs b/net/webrtc/src/aws_kvs_signaller/imp.rs index 128b6ca3f..385a6656c 100644 --- a/net/webrtc/src/aws_kvs_signaller/imp.rs +++ b/net/webrtc/src/aws_kvs_signaller/imp.rs @@ -345,7 +345,7 @@ impl Signaller { gst::info!(CAT, "Ice servers: {:?}", ice_servers); self.obj().connect_closure( - "consumer-added", + "webrtcbin-ready", false, glib::closure!(|_signaller: &super::AwsKvsSignaller, _consumer_identifier: &str, diff --git a/net/webrtc/src/livekit_signaller/imp.rs b/net/webrtc/src/livekit_signaller/imp.rs index ae85e89e1..dd4efa551 100644 --- a/net/webrtc/src/livekit_signaller/imp.rs +++ b/net/webrtc/src/livekit_signaller/imp.rs @@ -269,7 +269,7 @@ impl SignallableImpl for Signaller { let weak_imp = imp.downgrade(); imp.obj().connect_closure( - "consumer-added", + "webrtcbin-ready", false, glib::closure!(|_signaler: &super::LiveKitSignaller, _consumer_identifier: &str, diff --git a/net/webrtc/src/signaller/iface.rs b/net/webrtc/src/signaller/iface.rs index 2ab6f475e..98f57d1d2 100644 --- a/net/webrtc/src/signaller/iface.rs +++ b/net/webrtc/src/signaller/iface.rs @@ -284,9 +284,12 @@ unsafe impl prelude::ObjectInterface for Signallable { * * This signal can be used to tweak @webrtcbin, creating a data * channel for example. + * + * Deprecated: 1.24: Use `webrtcbin-ready` instead */ Signal::builder("consumer-added") .param_types([String::static_type(), gst::Element::static_type()]) + .deprecated() .build(), /** * GstRSWebRTCSignallableIface::consumer-removed: @@ -386,6 +389,18 @@ unsafe impl prelude::ObjectInterface for Signallable { false }) .build(), + /** + * GstRSWebRTCSignallableIface::webrtcbin-ready: + * @self: The object implementing #GstRSWebRTCSignallableIface + * @peer_id: Id of the consumer/producer + * @webrtcbin: The internal WebRTCBin element + * + * This signal can be used to tweak @webrtcbin, creating a data + * channel for example. + */ + Signal::builder("webrtcbin-ready") + .param_types([String::static_type(), gst::Element::static_type()]) + .build(), ] }); SIGNALS.as_ref() diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs index b1348f7d4..453e5e12c 100644 --- a/net/webrtc/src/webrtcsink/imp.rs +++ b/net/webrtc/src/webrtcsink/imp.rs @@ -2613,6 +2613,7 @@ impl BaseWebRTCSink { // moment. element.emit_by_name::<()>("consumer-added", &[&peer_id, &webrtcbin]); signaller.emit_by_name::<()>("consumer-added", &[&peer_id, &webrtcbin]); + signaller.emit_by_name::<()>("webrtcbin-ready", &[&peer_id, &webrtcbin]); // We don't connect to on-negotiation-needed, this in order to call the above // signal without holding the state lock: diff --git a/net/webrtc/src/whip_signaller/imp.rs b/net/webrtc/src/whip_signaller/imp.rs index 112b4336e..741a50c6a 100644 --- a/net/webrtc/src/whip_signaller/imp.rs +++ b/net/webrtc/src/whip_signaller/imp.rs @@ -426,7 +426,7 @@ impl SignallableImpl for WhipClient { } self.obj().connect_closure( - "consumer-added", + "webrtcbin-ready", false, glib::closure!(|signaller: &super::WhipClientSignaller, _consumer_identifier: &str, |