X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=91d87e7ae03d6086c0db7e152b389eba3f6dbee7;hp=b7329c48bce647b113638a5609b39de698ef81fd;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/wav_filter.c b/wav_filter.c
index b7329c48..91d87e7a 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -6,11 +6,15 @@
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 
-#include "para.h"
+#include <regex.h>
+#include <stdbool.h>
 
+#include "para.h"
+#include "error.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "portable_io.h"
@@ -23,15 +27,13 @@
 #define BITS 16
 
 static void make_wav_header(unsigned int channels, unsigned int samplerate,
-		struct filter_node *fn)
+		char *headbuf)
 {
 
-	char *headbuf = fn->buf;
 	unsigned int size = 0x7fffffff;
 	int bytespersec = channels * samplerate * BITS / 8;
 	int align = channels * BITS / 8;
 
-	assert(channels);
 	PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
@@ -57,7 +59,11 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
 	if (*bof) {
 		if (!len)
 			return 0;
-		make_wav_header(fn->fc->channels, fn->fc->samplerate, fn);
+		if (!fn->fc->channels || !fn->fc->samplerate) {
+			PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
+			return -E_WAV_BAD_FC;
+		}
+		make_wav_header(fn->fc->channels, fn->fc->samplerate, fn->buf);
 		fn->loaded = WAV_HEADER_LEN;
 		*bof = 0;
 //		return 0;
@@ -91,6 +97,68 @@ static void wav_open(struct filter_node *fn)
 		fn, fn->buf, fn->loaded);
 }
 
+static void wav_pre_select(struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+	size_t iqs = btr_get_input_queue_size(fn->btrn);
+
+	t->error = 0;
+	if (iqs == 0)
+		return;
+	s->timeout.tv_sec = 0;
+	s->timeout.tv_usec = 1;
+}
+
+static void wav_post_select(__a_unused struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct btr_node *btrn = fn->btrn;
+	size_t iqs = btr_get_input_queue_size(btrn);
+	int ret;
+	char *header, *buf;
+	int32_t rate, ch;
+
+
+	t->error = 0;
+	if (iqs == 0) {
+		ret = -E_WAV_EOF;
+		if (btr_no_parent(btrn))
+			goto err;
+		return;
+	}
+	ret = btr_exec_up(btrn, "samplerate", &buf);
+	if (ret < 0) {
+		ret = -E_WAV_BAD_FC;
+		goto err;
+	}
+	ret = para_atoi32(buf, &rate);
+	free(buf);
+	if (ret < 0)
+		goto err;
+	ret = btr_exec_up(btrn, "channels", &buf);
+	if (ret < 0) {
+		ret = -E_WAV_BAD_FC;
+		goto err;
+	}
+	ret = para_atoi32(buf, &ch);
+	free(buf);
+	if (ret < 0)
+		goto err;
+	header = para_malloc(WAV_HEADER_LEN);
+	make_wav_header(ch, rate, header);
+	btr_add_output(header, WAV_HEADER_LEN, btrn);
+	ret = -E_WAV_SUCCESS;
+err:
+	t->error = ret;
+	wav_close(fn);
+	if (ret == -E_WAV_SUCCESS)
+		btr_splice_out_node(btrn);
+	else {
+		btr_del_node(btrn);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	}
+}
+
 /**
  * the init function of the wav filter
  *
@@ -101,4 +169,6 @@ void wav_filter_init(struct filter *f)
 	f->convert = wav_convert;
 	f->close = wav_close;
 	f->open = wav_open;
+	f->pre_select = wav_pre_select;
+	f->post_select = wav_post_select;
 }