From 5b01e43a12c83f575488d86a9dc6e521493e7446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Mon, 11 Mar 2024 10:10:01 +0100 Subject: [PATCH] webrtc: update further to WebRTCSessionDescription sdp accessor changes See: https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1406 Part-of: --- net/webrtc/src/whip_signaller/imp.rs | 4 ++-- net/webrtchttp/src/whepsrc/imp.rs | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net/webrtc/src/whip_signaller/imp.rs b/net/webrtc/src/whip_signaller/imp.rs index 769ad765..9f7adc4f 100644 --- a/net/webrtc/src/whip_signaller/imp.rs +++ b/net/webrtc/src/whip_signaller/imp.rs @@ -695,10 +695,10 @@ impl WhipServer { gst::info!(CAT, obj: obj, "ICE gathering complete"); let ans: Option; let settings = obj.imp().settings.lock().unwrap(); - if let Some(answer_sdp) = webrtcbin + if let Some(answer_desc) = webrtcbin .property::>("local-description") { - ans = Some(answer_sdp.sdp()); + ans = Some(answer_desc.sdp().to_owned()); } else { ans = None; } diff --git a/net/webrtchttp/src/whepsrc/imp.rs b/net/webrtchttp/src/whepsrc/imp.rs index 30b4acda..76d6e992 100644 --- a/net/webrtchttp/src/whepsrc/imp.rs +++ b/net/webrtchttp/src/whepsrc/imp.rs @@ -901,7 +901,7 @@ impl WhepSrc { .webrtcbin .property::>("local-description"); - let offer_sdp = match local_desc { + let sess_desc = match local_desc { None => { gst::element_imp_error!( self, @@ -910,18 +910,19 @@ impl WhepSrc { ); return; } - Some(offer) => offer, + Some(mut local_desc) => { + local_desc.set_type(WebRTCSDPType::Offer); + local_desc + } }; gst::debug!( CAT, imp: self, "Sending offer SDP: {:?}", - offer_sdp.sdp().as_text() + sess_desc.sdp().as_text() ); - let sess_desc = WebRTCSessionDescription::new(WebRTCSDPType::Offer, offer_sdp.sdp()); - let timeout; let endpoint;