X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=8b0e183f9fdf68908ec0dec8ee410295e577d261;hp=21a0dad9253e66877ada6da5814062764d1269fb;hb=e4713d70469e7ca1afd8e8b9a3e67c3764cf3933;hpb=c4d243653174f3f4ffc331a4bfc54de94d612f34

diff --git a/write.c b/write.c
index 21a0dad9..8b0e183f 100644
--- a/write.c
+++ b/write.c
@@ -42,6 +42,23 @@ struct check_wav_task {
 	struct task task;
 };
 
+enum check_wav_state {
+	CWS_NEED_HEADER,
+	CWS_HAVE_HEADER,
+	CWS_NO_HEADER,
+};
+
+struct check_wav_task_btr {
+	int state;
+	/** Number of channels specified in wav header given by \a buf. */
+	unsigned channels;
+	/** Sample rate specified in wav header given by \a buf. */
+	unsigned samplerate;
+	/** The task structure used by the scheduler. */
+	struct task task;
+	struct btr_node *btrn;
+};
+
 /** Delay writing until given time. */
 struct initial_delay_task {
 	/** The time the first data should be written out. */
@@ -103,6 +120,85 @@ out:
 	s->timeout.tv_usec = 1;
 }
 
+static void check_wav_pre_select_btr(__a_unused struct sched *s, struct task *t)
+{
+	struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task);
+
+	if (btr_get_input_queue_size(cwt->btrn) < WAV_HEADER_LEN)
+		return;
+	s->timeout.tv_sec = 0;
+	s->timeout.tv_usec = 1;
+}
+
+static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
+{
+	struct check_wav_task_btr *cwt = btr_context(btrn);
+
+	if (!strcmp(cmd, "samplerate")) {
+		if (cwt->state != CWS_HAVE_HEADER)
+			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+		*result = make_message("%d", cwt->samplerate);
+		return 1;
+	}
+	if (!strcmp(cmd, "channels")) {
+		if (cwt->state != CWS_HAVE_HEADER)
+			return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+		*result = make_message("%d", cwt->samplerate);
+		return 1;
+	}
+	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+}
+
+static void check_wav_post_select_btr(__a_unused struct sched *s, struct task *t)
+{
+	struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task);
+	unsigned char *a;
+	size_t sz = btr_get_input_queue_size(cwt->btrn);
+
+	t->error = 0;
+	if (cwt->state != CWS_NEED_HEADER)
+		goto out;
+	if (sz < WAV_HEADER_LEN) {
+		if (!btr_no_parent(cwt->btrn))
+			return;
+		if (sz != 0) {
+			cwt->state = CWS_NO_HEADER;
+			goto out;
+		}
+		t->error = -E_WRITE_EOF;
+		goto err;
+	}
+	cwt->channels = 2;
+	cwt->samplerate = 44100;
+	btr_next_buffer(cwt->btrn, (char **)&a);
+	if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') {
+		PARA_NOTICE_LOG("wav header not found\n");
+		cwt->state = CWS_NO_HEADER;
+		sprintf(t->status, "check wav: no header");
+		goto consume;
+	}
+	PARA_INFO_LOG("found wav header\n");
+	cwt->state = CWS_HAVE_HEADER;
+	sprintf(t->status, "check wav: have header");
+	cwt->channels = (unsigned) a[22];
+	cwt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
+consume:
+	PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate);
+	btr_consume(cwt->btrn, WAV_HEADER_LEN);
+out:
+	if (sz) {
+		btr_pushdown(cwt->btrn);
+		s->timeout.tv_sec = 0;
+		s->timeout.tv_usec = 1;
+	} else {
+		if (btr_no_parent(cwt->btrn))
+			t->error = -E_WRITE_EOF;
+	}
+err:
+	if (t->error < 0)
+		btr_del_node(cwt->btrn);
+}
+
 static void initial_delay_pre_select(struct sched *s, struct task *t)
 {
 	struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task);
@@ -189,21 +285,30 @@ static int main_btr(struct sched *s)
 	struct writer_node *wn = para_malloc(sizeof(*wn));
 	struct writer *w = writers + DEFAULT_WRITER;
 	int ret;
+	struct check_wav_task_btr _cwt, *cwt = &_cwt;
 
-	wn->writer_num = DEFAULT_WRITER;
-	wn->conf = writers[DEFAULT_WRITER].parse_config("-B");
-	sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL);
+	sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL, NULL);
 	stdin_set_defaults(&sit);
 	register_task(&sit.task);
 
-	wn->btrn = btr_new_node("writer", sit.btrn, NULL);
+	cwt->state = CWS_NEED_HEADER;
+	cwt->btrn = btr_new_node("check wav", sit.btrn, check_wav_exec, cwt);
+	sprintf(cwt->task.status, "check wav");
+	cwt->task.pre_select = check_wav_pre_select_btr;
+	cwt->task.post_select = check_wav_post_select_btr;
+	register_task(&cwt->task);
 
+	wn->writer_num = DEFAULT_WRITER;
+	wn->conf = writers[DEFAULT_WRITER].parse_config("-B");
+	wn->btrn = btr_new_node("writer", cwt->btrn, NULL, NULL);
 	sprintf(wn->task.status, "some writer");
 	w->open(wn);
 	wn->task.post_select = w->post_select_btr;
 	wn->task.pre_select = w->pre_select_btr;
 	register_task(&wn->task);
 
+
+
 	s->default_timeout.tv_sec = 10;
 	s->default_timeout.tv_usec = 50000;
 	ret = schedule(s);