diff options
author | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2008-08-04 15:57:51 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2008-09-22 13:37:58 -0400 |
commit | cbe7189aaa53093a593e5b07cc8de5050e95ee98 (patch) | |
tree | 36976d5c1f6ce79e02a7aa3f3a779f7aea52ae12 /gst | |
parent | c8cd93a9a92d579f2a7090acea65e72180b358a4 (diff) | |
download | libnice-cbe7189aaa53093a593e5b07cc8de5050e95ee98.tar.gz |
Save the to/from addresses and put them in newly created buffers
Diffstat (limited to 'gst')
-rw-r--r-- | gst/gstnicesrc.c | 83 | ||||
-rw-r--r-- | gst/gstnicesrc.h | 15 |
2 files changed, 95 insertions, 3 deletions
diff --git a/gst/gstnicesrc.c b/gst/gstnicesrc.c index 895c8bd..3c55114 100644 --- a/gst/gstnicesrc.c +++ b/gst/gstnicesrc.c @@ -206,6 +206,9 @@ gst_nice_src_read_callback (NiceAgent *agent, if (GST_PAD_CAPS (basesrc->srcpad)) GST_BUFFER_CAPS (mybuf) = gst_caps_ref (GST_PAD_CAPS (basesrc->srcpad)); + mybuf->from = nicesrc->from; + mybuf->to = nicesrc->to; + nicesrc->outbuf = GST_BUFFER_CAST (mybuf); g_main_loop_quit (nicesrc->mainloop); @@ -218,8 +221,10 @@ gst_nice_src_unlock_idler (gpointer data) g_main_loop_quit (nicesrc->mainloop); + GST_OBJECT_LOCK (nicesrc); g_source_unref (nicesrc->idle_source); nicesrc->idle_source = NULL; + GST_OBJECT_UNLOCK (nicesrc); return FALSE; } @@ -298,6 +303,10 @@ gst_nice_src_dispose (GObject *object) { GstNiceSrc *src = GST_NICE_SRC (object); + if (src->new_selected_pair_id) + g_signal_handler_disconnect (src->agent, src->new_selected_pair_id); + src->new_selected_pair_id = 0; + if (src->agent) g_object_unref (src->agent); src->agent = NULL; @@ -371,6 +380,69 @@ gst_nice_src_get_property ( } } +static void +nice_address_to_gst_net_address (NiceAddress *niceaddr, GstNetAddress *gstaddr) +{ + switch (niceaddr->s.addr.sa_family) + { + case AF_INET: + gst_netaddress_set_ip4_address (gstaddr, + niceaddr->s.ip4.sin_addr.s_addr, + niceaddr->s.ip4.sin_port); + break; + case AF_INET6: + gst_netaddress_set_ip6_address (gstaddr, + niceaddr->s.ip6.sin6_addr.s6_addr, + niceaddr->s.ip6.sin6_port); + break; + default: + break; + } +} + +static void +new_selected_pair_cb (NiceAgent *agent, guint stream_id, guint component_id, + gchar *local_cand, gchar *remote_cand, GstNiceSrc *src) +{ + GST_OBJECT_LOCK (src); + + if (stream_id == src->stream_id && component_id == src->component_id) + { + GSList *local_candidates = nice_agent_get_local_candidates ( + src->agent, stream_id, component_id); + GSList *remote_candidates = nice_agent_get_remote_candidates ( + src->agent, stream_id, component_id); + GSList *item = NULL; + + for (item = local_candidates; item; item = g_slist_next (item)) + { + NiceCandidate *cand = item->data; + if (!strcmp (local_cand, cand->foundation)) + { + nice_address_to_gst_net_address (&cand->addr, &src->to); + break; + } + } + + for (item = remote_candidates; item; item = g_slist_next (item)) + { + NiceCandidate *cand = item->data; + if (!strcmp (remote_cand, cand->foundation)) + { + nice_address_to_gst_net_address (&cand->addr, &src->from); + break; + } + } + + g_slist_foreach (local_candidates, (GFunc) nice_candidate_free, NULL); + g_slist_free (local_candidates); + g_slist_foreach (remote_candidates, (GFunc) nice_candidate_free, NULL); + g_slist_free (remote_candidates); + } + + GST_OBJECT_UNLOCK (src); +} + static GstStateChangeReturn gst_nice_src_change_state (GstElement * element, GstStateChange transition) { @@ -389,14 +461,25 @@ gst_nice_src_change_state (GstElement * element, GstStateChange transition) } else { + GST_OBJECT_LOCK (src); nice_agent_attach_recv (src->agent, src->stream_id, src->component_id, g_main_loop_get_context (src->mainloop), gst_nice_src_read_callback, (gpointer) src); + + if (!src->new_selected_pair_id) + src->new_selected_pair_id = g_signal_connect (src->agent, + "new-selected-pair", G_CALLBACK (new_selected_pair_cb), src); + GST_OBJECT_UNLOCK (src); } break; case GST_STATE_CHANGE_READY_TO_NULL: + GST_OBJECT_LOCK (src); nice_agent_attach_recv (src->agent, src->stream_id, src->component_id, g_main_loop_get_context (src->mainloop), NULL, NULL); + if (src->new_selected_pair_id) + g_signal_handler_disconnect (src->agent, src->new_selected_pair_id); + src->new_selected_pair_id = 0; + GST_OBJECT_UNLOCK (src); break; default: break; diff --git a/gst/gstnicesrc.h b/gst/gstnicesrc.h index bac19a2..960328d 100644 --- a/gst/gstnicesrc.h +++ b/gst/gstnicesrc.h @@ -63,13 +63,22 @@ struct _GstNiceSrc { GstBaseSrc parent; GstPad *srcpad; + GMainLoop *mainloop; + + /* Protected by the object lock */ + gboolean unlocked; + GSource *idle_source; NiceAgent *agent; guint stream_id; guint component_id; - GMainLoop *mainloop; + + /* Protected by the stream lock */ GstBuffer *outbuf; - gboolean unlocked; - GSource *idle_source; + + /* Protected by the object lock */ + gulong new_selected_pair_id; + GstNetAddress from; + GstNetAddress to; }; typedef struct _GstNiceSrcClass GstNiceSrcClass; |