FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

webrtc: Use new libnice API to get the candidate relay address

Browse Source 
Corresponding libnice API added in:
https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/229 (0.1.19)
https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/232 (0.1.20)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1998>
This commit is contained in:
Philippe Normand 2022-05-11 09:17:46 +01:00 committed by GStreamer Marge Bot
parent 08021caa73
commit eefd793011
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
View File

@ -886,10 +886,44 @@ static gchar *
_get_server_url (GstWebRTCICE * ice, NiceCandidate * cand) _get_server_url (GstWebRTCICE * ice, NiceCandidate * cand)
{ {
switch (cand->type) { switch (cand->type) {
case NICE_CANDIDATE_TYPE_RELAYED: case NICE_CANDIDATE_TYPE_RELAYED:{
#if NICE_CHECK_VERSION(0, 1, 19)
NiceAddress addr;
gchar ipaddr[NICE_ADDRESS_STRING_LEN];
nice_candidate_relay_address (cand, &addr);
nice_address_to_string (&addr, ipaddr);
return g_strdup (ipaddr);
#else
static gboolean warned = FALSE;
if (!warned) {
GST_WARNING
("libnice version < 0.1.19 detected, relayed candidate server address might be wrong.");
warned = TRUE;
}
return g_strdup (gst_uri_get_host (ice->turn_server)); return g_strdup (gst_uri_get_host (ice->turn_server));
case NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE: #endif
}
case NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE:{
#if NICE_CHECK_VERSION(0, 1, 20)
NiceAddress addr;
gchar ipaddr[NICE_ADDRESS_STRING_LEN];
if (nice_candidate_stun_server_address (cand, &addr)) {
nice_address_to_string (&addr, ipaddr);
return g_strdup (ipaddr);
} else {
return g_strdup (gst_uri_get_host (ice->stun_server));
}
#else
static gboolean warned = FALSE;
if (!warned) {
GST_WARNING
("libnice version < 0.1.20 detected, server-reflexive candidate server "
"address might be wrong.");
warned = TRUE;
}
#endif
return g_strdup (gst_uri_get_host (ice->stun_server)); return g_strdup (gst_uri_get_host (ice->stun_server));
}
default: default:
return g_strdup (""); return g_strdup ("");
} }