mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 23:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for netbuffer api change

Browse source
This commit is contained in:
Wim Taymans 2011-10-31 02:40:08 +01:00
parent 75e0c6052f
commit 83ccefb24e
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rtpmanager/rtpsession.c
View file

@ -1280,7 +1280,7 @@ check_collision (RTPSession * sess, RTPSource * source,
} }
if (have_from) { if (have_from) {
if (gst_netaddress_equal (from, &arrival->address)) { if (gst_net_address_equal (from, &arrival->address)) {
/* Address is the same */ /* Address is the same */
return FALSE; return FALSE;
} else { } else {
@ -1290,7 +1290,7 @@ check_collision (RTPSession * sess, RTPSource * source,
if (rtp_source_find_conflicting_address (source, if (rtp_source_find_conflicting_address (source,
&arrival->address, arrival->current_time)) { &arrival->address, arrival->current_time)) {
gchar buf1[40]; gchar buf1[40];
gst_netaddress_to_string (&arrival->address, buf1, 40); gst_net_address_to_string (&arrival->address, buf1, 40);
GST_LOG ("Known conflict on %x for %s, dropping packet", GST_LOG ("Known conflict on %x for %s, dropping packet",
rtp_source_get_ssrc (source), buf1); rtp_source_get_ssrc (source), buf1);
return TRUE; return TRUE;
@ -1303,8 +1303,8 @@ check_collision (RTPSession * sess, RTPSource * source,
rtp_source_add_conflicting_address (source, from, rtp_source_add_conflicting_address (source, from,
arrival->current_time); arrival->current_time);
gst_netaddress_to_string (from, buf1, 40); gst_net_address_to_string (from, buf1, 40);
gst_netaddress_to_string (&arrival->address, buf2, 40); gst_net_address_to_string (&arrival->address, buf2, 40);
GST_DEBUG ("New conflict for ssrc %x, replacing %s with %s," GST_DEBUG ("New conflict for ssrc %x, replacing %s with %s,"
" saving old as known conflict", " saving old as known conflict",
rtp_source_get_ssrc (source), buf1, buf2); rtp_source_get_ssrc (source), buf1, buf2);

8
gst/rtpmanager/rtpsource.c
View file

@ -307,12 +307,12 @@ rtp_source_create_stats (RTPSource * src)
/* add address and port */ /* add address and port */
if (src->have_rtp_from) { if (src->have_rtp_from) {
gst_netaddress_to_string (&src->rtp_from, address_str, gst_net_address_to_string (&src->rtp_from, address_str,
sizeof (address_str)); sizeof (address_str));
gst_structure_set (s, "rtp-from", G_TYPE_STRING, address_str, NULL); gst_structure_set (s, "rtp-from", G_TYPE_STRING, address_str, NULL);
} }
if (src->have_rtcp_from) { if (src->have_rtcp_from) {
gst_netaddress_to_string (&src->rtcp_from, address_str, gst_net_address_to_string (&src->rtcp_from, address_str,
sizeof (address_str)); sizeof (address_str));
gst_structure_set (s, "rtcp-from", G_TYPE_STRING, address_str, NULL); gst_structure_set (s, "rtcp-from", G_TYPE_STRING, address_str, NULL);
} }
@ -1718,7 +1718,7 @@ rtp_source_find_conflicting_address (RTPSource * src, GstNetAddress * address,
item; item = g_list_next (item)) { item; item = g_list_next (item)) {
RTPConflictingAddress *known_conflict = item->data; RTPConflictingAddress *known_conflict = item->data;
if (gst_netaddress_equal (address, &known_conflict->address)) { if (gst_net_address_equal (address, &known_conflict->address)) {
known_conflict->time = time; known_conflict->time = time;
return TRUE; return TRUE;
} }
@ -1778,7 +1778,7 @@ rtp_source_timeout (RTPSource * src, GstClockTime current_time,
src->conflicting_addresses = src->conflicting_addresses =
g_list_delete_link (src->conflicting_addresses, item); g_list_delete_link (src->conflicting_addresses, item);
gst_netaddress_to_string (&known_conflict->address, buf, 40); gst_net_address_to_string (&known_conflict->address, buf, 40);
GST_DEBUG ("collision %p timed out: %s", known_conflict, buf); GST_DEBUG ("collision %p timed out: %s", known_conflict, buf);
g_free (known_conflict); g_free (known_conflict);
} }

2
gst/udp/gstdynudpsink.c
View file

@ -199,7 +199,7 @@ gst_dynudpsink_render (GstBaseSink * bsink, GstBuffer * buffer)
GST_DEBUG ("about to send %d bytes", size); GST_DEBUG ("about to send %d bytes", size);
/* let's get the address from the metaata */ /* let's get the address from the metaata */
gst_netaddress_get_ip4_address (&meta->naddr, &destaddr, &destport); gst_net_address_get_ip4_address (&meta->naddr, &destaddr, &destport);
GST_DEBUG ("sending %d bytes to client %d port %d", size, destaddr, destport); GST_DEBUG ("sending %d bytes to client %d port %d", size, destaddr, destport);

4
gst/udp/gstudpsrc.c
View file

@ -534,7 +534,7 @@ no_select:
switch (sa.sa.sa_family) { switch (sa.sa.sa_family) {
case AF_INET: case AF_INET:
{ {
gst_netaddress_set_ip4_address (&meta->naddr, sa.sa_in.sin_addr.s_addr, gst_net_address_set_ip4_address (&meta->naddr, sa.sa_in.sin_addr.s_addr,
sa.sa_in.sin_port); sa.sa_in.sin_port);
} }
break; break;
@ -543,7 +543,7 @@ no_select:
guint8 ip6[16]; guint8 ip6[16];
memcpy (ip6, &sa.sa_in6.sin6_addr, sizeof (ip6)); memcpy (ip6, &sa.sa_in6.sin6_addr, sizeof (ip6));
gst_netaddress_set_ip6_address (&meta->naddr, ip6, sa.sa_in6.sin6_port); gst_net_address_set_ip6_address (&meta->naddr, ip6, sa.sa_in6.sin6_port);
} }
break; break;
default: default: