Skip to content

basertpendpoint: add externalIPv4 and externalIPv6 parameters, simila… #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpocock wants to merge 1 commit into
base: bionic-gstreamer
Choose a base branch
from
Open

basertpendpoint: add externalIPv4 and externalIPv6 parameters, simila… #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/gst-plugins/rtpendpoint/kmsrtpendpoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,20 @@ kms_rtp_endpoint_set_addr (KmsRtpEndpoint * self)
{
GList *ips, *l;
gboolean done = FALSE;
gboolean use_ipv6;
gchar *external_ip;

g_object_get (self, "use-ipv6", &use_ipv6, NULL);

g_object_get (self, use_ipv6 ? "external-ipv6" : "external-ipv4",
&external_ip, NULL);

if (external_ip != NULL) {
g_object_set (self, "addr", external_ip, NULL);
g_free (external_ip);
done = TRUE;
return;
}

ips = nice_interfaces_get_local_ips (FALSE);
for (l = ips; l != NULL && !done; l = l->next) {
Expand All @@ -339,9 +353,7 @@ kms_rtp_endpoint_set_addr (KmsRtpEndpoint * self)
case G_SOCKET_FAMILY_IPV4:
{
gchar *addr_str;
gboolean use_ipv6;

g_object_get (self, "use-ipv6", &use_ipv6, NULL);
if (is_ipv6 != use_ipv6) {
GST_DEBUG_OBJECT (self, "Skip address (wanted IPv6: %d)", use_ipv6);
break;
Expand Down Expand Up @@ -1168,7 +1180,8 @@ kms_rtp_endpoint_init (KmsRtpEndpoint * self)

g_object_set (G_OBJECT (self), "bundle",
FALSE, "rtcp-mux", FALSE, "rtcp-nack", TRUE, "rtcp-remb", TRUE,
"max-video-recv-bandwidth", 0, NULL);
"max-video-recv-bandwidth", 0, "external-ipv4", 0, "external-ipv6", 0,
NULL);
/* FIXME: remove max-video-recv-bandwidth when it b=AS:X is in the SDP offer */
}

Expand Down