X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=269c4d6d5fb516402d756906bdb57fc5c2be2275;hp=7af5ace6533aa88a85b5ea9c8295867192164af0;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=810761a3cdf3f75dd8e07a5d903793048c36df1d

diff --git a/filter_common.c b/filter_common.c
index 7af5ace6..269c4d6d 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -133,9 +133,46 @@ void generic_filter_pre_select(struct sched *s, struct task *t)
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 
 	t->error = 0;
-	if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0) {
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
-	}
+	if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0)
+		sched_min_delay(s);
 }
 
+#ifdef WORDS_BIGENDIAN
+#define DECODER_SAMPLE_FORMAT SF_S16_BE
+#else
+#define DECODER_SAMPLE_FORMAT SF_S16_LE
+#endif
+
+/**
+ * Execute a btr command for a decoder.
+ *
+ * The buffer tree nodes of the writers ask the parent nodes about sample_rate,
+ * channels count and sample format. This function is called by all decoders to
+ * answer these queries.
+ *
+ * \param cmd The command to be executed by the child node.
+ * \param sample_rate Known to the decoder.
+ * \param channels Known to the decoder.
+ * \param result Ascii representation on the answer is stored here.
+ */
+int decoder_execute(const char *cmd, unsigned sample_rate, unsigned channels,
+		char **result)
+{
+	if (!strcmp(cmd, "sample_rate")) {
+		if (sample_rate == 0)
+			return -E_BTR_NAVAIL;
+		*result = make_message("%u", sample_rate);
+		return 1;
+	}
+	if (!strcmp(cmd, "channels")) {
+		if (channels == 0)
+			return -E_BTR_NAVAIL;
+		*result = make_message("%u", channels);
+		return 1;
+	}
+	if (!strcmp(cmd, "sample_format")) {
+		*result = make_message("%u", DECODER_SAMPLE_FORMAT);
+		return 1;
+	}
+	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+}