summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.co.uk>2010-06-18 19:10:54 (GMT)
committerOlivier Crête <olivier.crete@collabora.co.uk>2010-06-18 19:16:27 (GMT)
commit74f9aaa0be64c4f63dee244fea20903d46b3147c (patch)
treec503362fc6ffd31d879b2798f813829143a25ba2
parent4188e9eff1041ec51b173c48df932264c1fdc2ab (diff)
downloadtelepathy-stream-engine-74f9aaa0be64c4f63dee244fea20903d46b3147c.tar.gz
telepathy-stream-engine-74f9aaa0be64c4f63dee244fea20903d46b3147c.tar.xz
Set the priority to TC_PRIO_INTERACTIVE*, Fixes NB#175648, version 0.5.15+0maemo2+harmattan2
-rw-r--r--debian/changelog10
-rw-r--r--debian/patches/0007-Use-TC_PRIO-markings-for-ToS.patch40
2 files changed, 49 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 72e4f6f..6c1cadd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-stream-engine (0.5.15+0maemo2+harmattan2) unstable; urgency=low
+
+ * Use TC_PRIO_* macros for packet scheduling
+ * Fixes: NB#175648 - Set SO_PRIORITY to TC_PRIO_INTERACTIVE and
+ TC_PRIO_INTERACTIVE_BULK
+
+ -- Olivier Crête <olivier.crete@collabora.co.uk> Fri, 18 Jun 2010 15:03:39 -0400
+
telepathy-stream-engine (0.5.15+0maemo3+harmattan1) unstable; urgency=low
* Temporarily disable fatal criticals to work around NB#167932
@@ -6,7 +14,7 @@ telepathy-stream-engine (0.5.15+0maemo3+harmattan1) unstable; urgency=low
telepathy-stream-engine (0.5.15+0maemo2+harmattan1) unstable; urgency=low
- * Restore incorrect reversions, actually fixes NB#160072
+ * Restore incorrect reversions, actually fixes NB#160072
-- Olivier Crête <olivier.crete@collabora.co.uk> Thu, 25 Mar 2010 17:24:40 -0400
diff --git a/debian/patches/0007-Use-TC_PRIO-markings-for-ToS.patch b/debian/patches/0007-Use-TC_PRIO-markings-for-ToS.patch
new file mode 100644
index 0000000..124342e
--- /dev/null
+++ b/debian/patches/0007-Use-TC_PRIO-markings-for-ToS.patch
@@ -0,0 +1,40 @@
+From db8dbc23642b6bfb96204f05aed55b22fe7e5636 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
+Date: Fri, 18 Jun 2010 15:00:12 -0400
+Subject: [PATCH] Use TC_PRIO markings for ToS
+
+---
+ src/tp-stream-engine.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
+index 6ffeb8a..42e6e0d 100644
+--- a/src/tp-stream-engine.c
++++ b/src/tp-stream-engine.c
+@@ -37,6 +37,8 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++#include <linux/pkt_sched.h>
++
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
+@@ -1050,7 +1052,7 @@ channel_stream_created (TfChannel *chan G_GNUC_UNUSED,
+ GstIterator *iter;
+ GstElement *src;
+
+- g_object_set (stream, "tos", IPTOS_LOWDELAY, NULL);
++ g_object_set (stream, "tos", TC_PRIO_INTERACTIVE, NULL);
+
+ audiostream = tp_stream_engine_audio_stream_new (stream,
+ GST_BIN (self->priv->pipeline), &error);
+@@ -1098,7 +1100,7 @@ channel_stream_created (TfChannel *chan G_GNUC_UNUSED,
+ TpStreamEngineVideoStream *videostream = NULL;
+ GstPad *pad;
+
+- g_object_set (stream, "tos", IPTOS_THROUGHPUT, NULL);
++ g_object_set (stream, "tos", TC_PRIO_INTERACTIVE_BULK, NULL);
+
+ pad = gst_element_get_request_pad (self->priv->videotee, "src%d");
+