summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-05-11 15:19:52 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2011-05-11 15:19:52 -0400
commit2a3f24191e19ee703087c0a74e84a1281a73c568 (patch)
treea82f0983e3372e1193c1fcdfe7062633762ec55a
parent7e1d522f20f4fbb929944e2799f3a48ecc04aa49 (diff)
Set Farsight2's default header extensions and codecs
-rw-r--r--telepathy-farsight/stream.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/telepathy-farsight/stream.c b/telepathy-farsight/stream.c
index bd6644a..ca0586c 100644
--- a/telepathy-farsight/stream.c
+++ b/telepathy-farsight/stream.c
@@ -43,6 +43,7 @@
#include <gst/farsight/fs-conference-iface.h>
#include <gst/farsight/fs-rtp.h>
+#include <gst/farsight/fs-utils.h>
#include "stream.h"
#include "stream-priv.h"
@@ -739,6 +740,7 @@ get_all_properties_cb (TpProxy *proxy,
gboolean valid = FALSE;
guint i;
gboolean do_controlling = FALSE;
+ GList *rtp_header_extensions;
if (dbus_error &&
!(dbus_error->domain == DBUS_GERROR &&
@@ -1049,6 +1051,10 @@ get_all_properties_cb (TpProxy *proxy,
return;
}
+ if (!stream->priv->local_preferences)
+ stream->priv->local_preferences = fs_utils_get_default_codec_preferences (
+ GST_ELEMENT (stream->priv->fs_conference));
+
if (stream->priv->local_preferences)
if (!fs_session_set_codec_preferences (stream->priv->fs_session,
stream->priv->local_preferences,
@@ -1067,6 +1073,19 @@ get_all_properties_cb (TpProxy *proxy,
g_clear_error (&myerror);
}
+
+ rtp_header_extensions =
+ fs_utils_get_default_rtp_header_extension_preferences (
+ GST_ELEMENT (stream->priv->fs_conference),
+ tp_media_type_to_fs (stream->priv->media_type));
+
+ if (rtp_header_extensions)
+ {
+ g_object_set (stream->priv->fs_session,
+ "rtp-header-extension-preferences", rtp_header_extensions, NULL);
+ fs_rtp_header_extension_list_destroy (rtp_header_extensions);
+ }
+
if (g_object_class_find_property (
G_OBJECT_GET_CLASS (stream->priv->fs_session),
"no-rtcp-timeout"))