aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-03 23:00:26 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-05 17:08:22 +0800
commit81e35b4237433cf031004aa840e94d5f03c1b2f8 (patch)
tree7ec012a7a9ef4f74938faee4d35c0ef21b3b30e6 /libempathy
parentb51dda50b585f6c3cee76996bfb6f45da000447d (diff)
downloadgsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar.gz
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar.bz2
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar.lz
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar.xz
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.tar.zst
gsoc2013-empathy-81e35b4237433cf031004aa840e94d5f03c1b2f8.zip
call-handler: add properties tracking the candidates
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-call-handler.c161
-rw-r--r--libempathy/empathy-call-handler.h12
2 files changed, 173 insertions, 0 deletions
diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c
index 07620ad4b..2e1a119d2 100644
--- a/libempathy/empathy-call-handler.c
+++ b/libempathy/empathy-call-handler.c
@@ -59,6 +59,10 @@ enum {
PROP_SEND_VIDEO_CODEC,
PROP_RECV_AUDIO_CODECS,
PROP_RECV_VIDEO_CODECS,
+ PROP_AUDIO_REMOTE_CANDIDATE,
+ PROP_VIDEO_REMOTE_CANDIDATE,
+ PROP_AUDIO_LOCAL_CANDIDATE,
+ PROP_VIDEO_LOCAL_CANDIDATE,
};
/* private structure */
@@ -75,6 +79,10 @@ typedef struct {
FsCodec *send_video_codec;
GList *recv_audio_codecs;
GList *recv_video_codecs;
+ FsCandidate *audio_remote_candidate;
+ FsCandidate *video_remote_candidate;
+ FsCandidate *audio_local_candidate;
+ FsCandidate *video_local_candidate;
} EmpathyCallHandlerPriv;
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
@@ -121,6 +129,10 @@ empathy_call_handler_finalize (GObject *object)
fs_codec_destroy (priv->send_video_codec);
fs_codec_list_destroy (priv->recv_audio_codecs);
fs_codec_list_destroy (priv->recv_video_codecs);
+ fs_candidate_destroy (priv->audio_remote_candidate);
+ fs_candidate_destroy (priv->video_remote_candidate);
+ fs_candidate_destroy (priv->audio_local_candidate);
+ fs_candidate_destroy (priv->video_local_candidate);
if (G_OBJECT_CLASS (empathy_call_handler_parent_class)->finalize)
G_OBJECT_CLASS (empathy_call_handler_parent_class)->finalize (object);
@@ -203,6 +215,18 @@ empathy_call_handler_get_property (GObject *object,
case PROP_RECV_VIDEO_CODECS:
g_value_set_boxed (value, priv->recv_video_codecs);
break;
+ case PROP_AUDIO_REMOTE_CANDIDATE:
+ g_value_set_boxed (value, priv->audio_remote_candidate);
+ break;
+ case PROP_VIDEO_REMOTE_CANDIDATE:
+ g_value_set_boxed (value, priv->video_remote_candidate);
+ break;
+ case PROP_AUDIO_LOCAL_CANDIDATE:
+ g_value_set_boxed (value, priv->audio_local_candidate);
+ break;
+ case PROP_VIDEO_LOCAL_CANDIDATE:
+ g_value_set_boxed (value, priv->video_local_candidate);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -277,6 +301,38 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
g_object_class_install_property (object_class, PROP_RECV_VIDEO_CODECS,
param_spec);
+ param_spec = g_param_spec_boxed ("audio-remote-candidate",
+ "audio remote candidate",
+ "Remote candidate used for the audio stream",
+ FS_TYPE_CANDIDATE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
+
+ param_spec = g_param_spec_boxed ("video-remote-candidate",
+ "video remote candidate",
+ "Remote candidate used for the video stream",
+ FS_TYPE_CANDIDATE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
+
+ param_spec = g_param_spec_boxed ("audio-local-candidate",
+ "audio local candidate",
+ "Local candidate used for the audio stream",
+ FS_TYPE_CANDIDATE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_AUDIO_REMOTE_CANDIDATE, param_spec);
+
+ param_spec = g_param_spec_boxed ("video-local-candidate",
+ "video local candidate",
+ "Local candidate used for the video stream",
+ FS_TYPE_CANDIDATE,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+ g_object_class_install_property (object_class,
+ PROP_VIDEO_REMOTE_CANDIDATE, param_spec);
+
signals[CONFERENCE_ADDED] =
g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
@@ -400,6 +456,57 @@ update_receiving_codec (EmpathyCallHandler *self,
g_object_unref (session);
}
+static void
+update_candidates (EmpathyCallHandler *self,
+ FsCandidate *remote_candidate,
+ FsCandidate *local_candidate,
+ FsStream *stream)
+{
+ EmpathyCallHandlerPriv *priv = GET_PRIV (self);
+ FsSession *session;
+ FsMediaType type;
+
+ if (stream == NULL)
+ return;
+
+ g_object_get (stream, "session", &session, NULL);
+ if (session == NULL)
+ return;
+
+ g_object_get (session, "media-type", &type, NULL);
+
+ if (type == FS_MEDIA_TYPE_AUDIO)
+ {
+ if (remote_candidate != NULL)
+ {
+ priv->audio_remote_candidate = fs_candidate_copy (remote_candidate);
+ g_object_notify (G_OBJECT (self), "audio-remote-candidate");
+ }
+
+ if (local_candidate != NULL)
+ {
+ priv->audio_local_candidate = fs_candidate_copy (local_candidate);
+ g_object_notify (G_OBJECT (self), "audio-local-candidate");
+ }
+ }
+ else if (type == FS_MEDIA_TYPE_VIDEO)
+ {
+ if (remote_candidate != NULL)
+ {
+ priv->video_remote_candidate = fs_candidate_copy (remote_candidate);
+ g_object_notify (G_OBJECT (self), "video-remote-candidate");
+ }
+
+ if (local_candidate != NULL)
+ {
+ priv->video_local_candidate = fs_candidate_copy (local_candidate);
+ g_object_notify (G_OBJECT (self), "video-local-candidate");
+ }
+ }
+
+ g_object_unref (session);
+}
+
void
empathy_call_handler_bus_message (EmpathyCallHandler *handler,
GstBus *bus, GstMessage *message)
@@ -440,6 +547,24 @@ empathy_call_handler_bus_message (EmpathyCallHandler *handler,
update_receiving_codec (handler, codecs, stream);
}
+ else if (s != NULL &&
+ gst_structure_has_name (s, "farsight-new-active-candidate-pair"))
+ {
+ const GValue *val;
+ FsCandidate *remote_candidate, *local_candidate;
+ FsStream *stream;
+
+ val = gst_structure_get_value (s, "remote-candidate");
+ remote_candidate = g_value_get_boxed (val);
+
+ val = gst_structure_get_value (s, "local-candidate");
+ local_candidate = g_value_get_boxed (val);
+
+ val = gst_structure_get_value (s, "stream");
+ stream = g_value_get_object (val);
+
+ update_candidates (handler, remote_candidate, local_candidate, stream);
+ }
tf_channel_bus_message (priv->tfchannel, message);
}
@@ -723,3 +848,39 @@ empathy_call_handler_get_recv_video_codecs (EmpathyCallHandler *self)
return priv->recv_video_codecs;
}
+
+FsCandidate *
+empathy_call_handler_get_audio_remote_candidate (
+ EmpathyCallHandler *self)
+{
+ EmpathyCallHandlerPriv *priv = GET_PRIV (self);
+
+ return priv->audio_remote_candidate;
+}
+
+FsCandidate *
+empathy_call_handler_get_audio_local_candidate (
+ EmpathyCallHandler *self)
+{
+ EmpathyCallHandlerPriv *priv = GET_PRIV (self);
+
+ return priv->audio_local_candidate;
+}
+
+FsCandidate *
+empathy_call_handler_get_video_remote_candidate (
+ EmpathyCallHandler *self)
+{
+ EmpathyCallHandlerPriv *priv = GET_PRIV (self);
+
+ return priv->video_remote_candidate;
+}
+
+FsCandidate *
+empathy_call_handler_get_video_local_candidate (
+ EmpathyCallHandler *self)
+{
+ EmpathyCallHandlerPriv *priv = GET_PRIV (self);
+
+ return priv->video_local_candidate;
+}
diff --git a/libempathy/empathy-call-handler.h b/libempathy/empathy-call-handler.h
index 234bc800e..9f6fd9e3b 100644
--- a/libempathy/empathy-call-handler.h
+++ b/libempathy/empathy-call-handler.h
@@ -89,6 +89,18 @@ GList * empathy_call_handler_get_recv_audio_codecs (
GList * empathy_call_handler_get_recv_video_codecs (
EmpathyCallHandler *self);
+FsCandidate * empathy_call_handler_get_audio_remote_candidate (
+ EmpathyCallHandler *self);
+
+FsCandidate * empathy_call_handler_get_audio_local_candidate (
+ EmpathyCallHandler *self);
+
+FsCandidate * empathy_call_handler_get_video_remote_candidate (
+ EmpathyCallHandler *self);
+
+FsCandidate * empathy_call_handler_get_video_local_candidate (
+ EmpathyCallHandler *self);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_CALL_HANDLER_H__*/