X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=abd850b2499429ab5e992b771b4144d371a9d987;hp=3c69311f570209cec4bed6abe27036d6d5754853;hb=a4f75cecaaee538edb7aae3f0ff19168a1dab59d;hpb=f74525557a0f63090de04fcb2ad401db0783f9a3

diff --git a/wav_filter.c b/wav_filter.c
index 3c69311f..abd850b2 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,28 +7,27 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #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"
 
-/** size of the output buffer */
-#define WAV_OUTBUF_SIZE 81920
-/** a wav header is always 44 bytes */
+/** A wav header is always 44 bytes. */
 #define WAV_HEADER_LEN 44
-/** always write 16 bit header */
+/** Always write 16 bit header. */
 #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;
@@ -50,34 +49,8 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 	write_u32(headbuf + 40, size - 44); /* chunk size */
 }
 
-static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
-{
-	size_t copy;
-	int *bof = fn->private_data;
-
-	if (*bof) {
-		if (!len)
-			return 0;
-		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);
-		fn->loaded = WAV_HEADER_LEN;
-		*bof = 0;
-//		return 0;
-	}
-	copy = PARA_MIN(len, fn->bufsize - fn->loaded);
-	memmove(fn->buf + fn->loaded, inbuf, copy);
-	fn->loaded += copy;
-//	PARA_DEBUG_LOG("len = %d, copy = %d\n", len, copy);
-	return copy;
-}
-
 static void wav_close(struct filter_node *fn)
 {
-	free(fn->buf);
-	fn->buf = NULL;
 	free(fn->private_data);
 	fn->private_data = NULL;
 }
@@ -86,24 +59,80 @@ static void wav_open(struct filter_node *fn)
 {
 	int *bof;
 
-	fn->bufsize = WAV_OUTBUF_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
 	fn->private_data = para_malloc(sizeof(int));
 	bof = fn->private_data;
-	fn->loaded = 0;
 	*bof = 1;
-	PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
-		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;
+	if (ret == -E_WAV_SUCCESS)
+		btr_splice_out_node(btrn);
+	else {
+		btr_remove_node(btrn);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	}
 }
 
 /**
- * the init function of the wav filter
+ * The init function of the wav filter.
  *
- * \param f struct to initialize
+ * \param f Structure to initialize.
  */
 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;
 }