summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.co.uk>2010-07-19 16:20:35 (GMT)
committerOlivier Crête <olivier.crete@collabora.co.uk>2010-07-19 16:20:35 (GMT)
commit4ec0721b4e8230df8c2cc8942bfa6ceb5eda5073 (patch)
tree5fae63776028fe877f7539585d7010d81750b3ad
parent464ff35eac30269d1729474ffe6382890f1dc711 (diff)
downloadtelepathy-stream-engine-4ec0721b4e8230df8c2cc8942bfa6ceb5eda5073.tar.gz
telepathy-stream-engine-4ec0721b4e8230df8c2cc8942bfa6ceb5eda5073.tar.xz
Use IP Precedence for ToS markings, version 0.5.15+0maemo51
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0007-Disable-fatal-criticals-to-work-around-NB-167932.patch33
-rw-r--r--debian/patches/0008-Use-maemo-specify-ToS-field-values.patch35
3 files changed, 41 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog
index e6241b0..e54f60e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+telepathy-stream-engine (0.5.15+0maemo51) unstable; urgency=low
+
+ * Use IP Precedence for ToS markings
+
+ -- Olivier Crête <olivier.crete@collabora.co.uk> Mon, 19 Jul 2010 12:17:15 -0400
+
telepathy-stream-engine (0.5.15+0maemo50) unstable; urgency=low
* Use TC_PRIO_* macros for packet scheduling
diff --git a/debian/patches/0007-Disable-fatal-criticals-to-work-around-NB-167932.patch b/debian/patches/0007-Disable-fatal-criticals-to-work-around-NB-167932.patch
deleted file mode 100644
index af7f7c1..0000000
--- a/debian/patches/0007-Disable-fatal-criticals-to-work-around-NB-167932.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4e6fe6578a0f45b810cb40a7706d7d45575e4044 Mon Sep 17 00:00:00 2001
-From: Lassi Syrjala <lassi.syrjala@nokia.com>
-Date: Sun, 9 May 2010 16:00:38 +0300
-Subject: [PATCH 1/1] Disable fatal criticals to work around NB#167932
-
----
- src/stream-engine-main.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/stream-engine-main.c b/src/stream-engine-main.c
-index bd6598f..78bd354 100644
---- a/src/stream-engine-main.c
-+++ b/src/stream-engine-main.c
-@@ -225,7 +225,7 @@ int main(int argc, char **argv)
-
-
-
--
-+#if 0
- {
- GLogLevelFlags fatal_mask;
-
-@@ -233,6 +233,7 @@ int main(int argc, char **argv)
- fatal_mask |= G_LOG_LEVEL_CRITICAL;
- g_log_set_always_fatal (fatal_mask);
- }
-+#endif
-
- g_set_prgname("telepathy-stream-engine");
-
---
-1.5.6.1
-
diff --git a/debian/patches/0008-Use-maemo-specify-ToS-field-values.patch b/debian/patches/0008-Use-maemo-specify-ToS-field-values.patch
new file mode 100644
index 0000000..4d0f22e
--- /dev/null
+++ b/debian/patches/0008-Use-maemo-specify-ToS-field-values.patch
@@ -0,0 +1,35 @@
+From 5418aac54af098ab181c4ec0ddac0da15a58752a Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
+Date: Mon, 19 Jul 2010 17:10:44 +0100
+Subject: [PATCH] Use maemo specify ToS field values
+
+---
+ src/tp-stream-engine.c | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
+index 42e6e0d..b3cde8a 100644
+--- a/src/tp-stream-engine.c
++++ b/src/tp-stream-engine.c
+@@ -1052,7 +1052,9 @@ channel_stream_created (TfChannel *chan G_GNUC_UNUSED,
+ GstIterator *iter;
+ GstElement *src;
+
+- g_object_set (stream, "tos", TC_PRIO_INTERACTIVE, NULL);
++ /* The value IPTOS_PREC_NETCONTROL (which is 0xE0)
++ * is from bug NB#175648 */
++ g_object_set (stream, "tos", IPTOS_PREC_NETCONTROL, NULL);
+
+ audiostream = tp_stream_engine_audio_stream_new (stream,
+ GST_BIN (self->priv->pipeline), &error);
+@@ -1100,7 +1102,9 @@ channel_stream_created (TfChannel *chan G_GNUC_UNUSED,
+ TpStreamEngineVideoStream *videostream = NULL;
+ GstPad *pad;
+
+- g_object_set (stream, "tos", TC_PRIO_INTERACTIVE_BULK, NULL);
++ /* The value IPTOS_PREC_CRITIC_ECP (which is 0xA0)
++ * is from bug NB#175648 */
++ g_object_set (stream, "tos", IPTOS_PREC_CRITIC_ECP, NULL);
+
+ pad = gst_element_get_request_pad (self->priv->videotee, "src%d");
+