From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Nov 2009 21:49:33 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~121
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=29adb40f69ca452a719e8519a8fa9452b3143e1d;hp=141dc61fdf8720b6e0126b10c18d429d9d4944db

Merge branch 'master' into next
---

diff --git a/oss_write.c b/oss_write.c
index 9ec85560..7edd486f 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -48,13 +48,13 @@ static int oss_pre_select(struct sched *s, struct writer_node *wn)
 	struct private_oss_write_data *powd = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
 
-	if (!*wng->loaded)
+	if (*wng->loaded - wn->written < powd->bytes_per_frame)
 		return 0;
 	para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
 	return 1;
 }
-static int oss_post_select(__a_unused struct sched *s,
-		struct writer_node *wn)
+
+static int oss_post_select(struct sched *s, struct writer_node *wn)
 {
 	int ret;
 	struct private_oss_write_data *powd = wn->private_data;
diff --git a/write.h b/write.h
index 1f316fc0..8816be73 100644
--- a/write.h
+++ b/write.h
@@ -107,6 +107,8 @@ struct writer_node_group {
 	struct task task;
 	/** Whether the group is open, i.e. wng_open() was called. */
 	int open;
+	/** Max number of bytes written in the previous post_select() call. */
+	int last_written;
 };
 
 /** Loop over each writer node in a writer group. */
diff --git a/write_common.c b/write_common.c
index 5eb6b796..3f6c0bbe 100644
--- a/write_common.c
+++ b/write_common.c
@@ -22,7 +22,7 @@ const char *writer_names[] ={WRITER_NAMES};
 /** the array of supported writers */
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
-static void wng_pre_select(__a_unused struct sched *s, struct task *t)
+static void wng_pre_select(struct sched *s, struct task *t)
 {
 	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	int i;
@@ -36,13 +36,25 @@ static void wng_pre_select(__a_unused struct sched *s, struct task *t)
 		if (t->error < 0)
 			return;
 	}
+	/*
+	 * Force a minimal delay if something was written during the previous
+	 * call to wng_post_select(). This is necessary because the filter
+	 * chain might still have data for us which it couldn't convert during
+	 * the previous run due to its buffer size constraints. In this case we
+	 * do not want to wait until the next input data arrives as this could
+	 * lead to buffer underruns.
+	 */
+	if (g->last_written == 0)
+		return;
+	s->timeout.tv_sec = 0;
+	s->timeout.tv_usec = 1;
 }
 
 static void wng_post_select(struct sched *s, struct task *t)
 {
 	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	int i;
-	size_t min_written = 0;
+	size_t min_written = 0, max_written = 0;
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
@@ -54,7 +66,9 @@ static void wng_post_select(struct sched *s, struct task *t)
 			min_written = wn->written;
 		else
 			min_written = PARA_MIN(min_written, wn->written);
+		max_written = PARA_MAX(max_written, wn->written);
 	}
+	g->last_written = max_written;
 	//PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
 	if (min_written) {
 		*g->loaded -= min_written;