summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2011-05-16 22:57:23 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2011-05-16 22:57:23 (GMT)
commit67f1f04658850f6f867c42723f1ab70e8de7c919 (patch)
tree832ea22944f7e7581e0a33e780eb0dac4703cb98
parent0d05c3efa1c37796ebceae75a9f825669350c704 (diff)
downloadtelepathy-farsight-67f1f04658850f6f867c42723f1ab70e8de7c919.tar.gz
telepathy-farsight-67f1f04658850f6f867c42723f1ab70e8de7c919.tar.xz
Set the rtp header extension preferences before the codec prefs
The RTP header extension preferences are only taken into account when the codec preferences are changed.
-rw-r--r--telepathy-farsight/stream.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/telepathy-farsight/stream.c b/telepathy-farsight/stream.c
index ca0586c..e20f3a9 100644
--- a/telepathy-farsight/stream.c
+++ b/telepathy-farsight/stream.c
@@ -1051,6 +1051,18 @@ get_all_properties_cb (TpProxy *proxy,
return;
}
+ 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 (!stream->priv->local_preferences)
stream->priv->local_preferences = fs_utils_get_default_codec_preferences (
GST_ELEMENT (stream->priv->fs_conference));
@@ -1073,19 +1085,6 @@ 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"))