X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=8c33b39e08ae783f2ca19ff75f4cda37fcb0a320;hp=5eb6b796cbff4a8ce74fae16017e4366485ae84f;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=e61e21f2aae608ff694c924cdeb2056ac1136b77

diff --git a/write_common.c b/write_common.c
index 5eb6b796..8c33b39e 100644
--- a/write_common.c
+++ b/write_common.c
@@ -7,12 +7,14 @@
 /** \file write_common.c common functions of para_audiod and para_write */
 
 #include <regex.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "write.h"
 #include "error.h"
 
@@ -22,7 +24,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 +38,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 +68,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;
@@ -220,6 +236,54 @@ struct writer_node_group *setup_default_wng(void)
 	wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
 	return wng;
 }
+
+void register_writer_node(struct writer_node *wn, struct btr_node *parent)
+{
+	struct writer *w = writers + wn->writer_num;
+	char *name = make_message("%s writer", writer_names[wn->writer_num]);
+	int ret;
+
+	wn->btrn = btr_new_node(name, parent, w->execute, wn);
+	strcpy(wn->task.status, name);
+	free(name);
+	ret = w->open(wn);
+	wn->task.post_select = w->post_select_btr;
+	wn->task.pre_select = w->pre_select_btr;
+	register_task(&wn->task);
+}
+
+/**
+ * Setup a writer node with the default writer.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with an empty
+ * configuration string.  It defaults to alsa for Linux, osx for OS X, oss for
+ * *BSD and the file writer if neither of these is supported.
+ *
+ * Once the writer configuration has been retrieved, a writer node is created,
+ * its buffer tree node is added to the buffer tree as a child of the given
+ * parent.
+ *
+ * Finally, the new writer node's taks structure is initialized and registered
+ * to the paraslash scheduler.
+ *
+ * \return A pointer to the allocated writer node group.
+ */
+int setup_writer_node(const char *arg, struct btr_node *parent,
+		struct writer_node *wn)
+{
+	if (arg)
+		wn->conf = check_writer_arg(arg, &wn->writer_num);
+	else {
+		wn->writer_num = DEFAULT_WRITER;
+		wn->conf = writers[DEFAULT_WRITER].parse_config("");
+	}
+	if (!wn->conf)
+		return -E_WRITE_COMMON_SYNTAX;
+	register_writer_node(wn, parent);
+	return 1;
+}
+
+
 /**
  * Print the help text of all writers to stdout.
  *
@@ -242,3 +306,31 @@ void print_writer_helps(int detailed)
 		ggo_print_help(&w->help, detailed);
 	}
 }
+
+static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result)
+{
+	char *buf = NULL;
+	int ret = btr_exec_up(btrn, key, &buf);
+
+	if (ret < 0)
+		return ret;
+	ret = para_atoi32(buf, result);
+	free(buf);
+	return ret;
+}
+
+/*
+ * Ask parent btr nodes for the samplerate of the current stream.
+ */
+int get_btr_samplerate(struct btr_node *btrn, int32_t *result)
+{
+	return get_btr_value(btrn, "samplerate", result);
+}
+
+/*
+ * Ask parent btr nodes for the channel count of the current stream.
+ */
+int get_btr_channels(struct btr_node *btrn, int32_t *result)
+{
+	return get_btr_value(btrn, "channels", result);
+}