X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=f79daf237e286dfc6821d06ad93dfdaa49bab84a;hp=9b7a92113e69ff236e08ce235ca306c9c410fd07;hb=aa234b7afe223879a7bd7274ce05a3a315a2ec49;hpb=5b4b082e7c37b46d5fa1729dff6496da8840085f diff --git a/write.c b/write.c index 9b7a9211..f79daf23 100644 --- a/write.c +++ b/write.c @@ -1,13 +1,15 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file write.c Paraslash's standalone wav/raw player. */ +#include #include #include +#include #include "para.h" #include "string.h" @@ -16,6 +18,7 @@ #include "sched.h" #include "ggo.h" #include "stdin.h" +#include "buffer_tree.h" #include "write.h" #include "write_common.h" #include "fd.h" @@ -39,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. */ @@ -100,6 +120,83 @@ 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->channels); + 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 out; + } + 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); + 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); + else { + if (btr_no_parent(cwt->btrn)) + t->error = -E_WRITE_EOF; + } +err: + if (t->error < 0) + btr_remove_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); @@ -122,7 +219,8 @@ register_check_wav: s->timeout.tv_usec = 1; } -INIT_STDERR_LOGGING(conf.loglevel_arg) +static int loglevel; +INIT_STDERR_LOGGING(loglevel) static struct writer_node_group *check_args(void) { @@ -130,6 +228,7 @@ static struct writer_node_group *check_args(void) struct writer_node_group *g = NULL; struct initial_delay_task *idt = &the_initial_delay_task; + loglevel = get_loglevel_by_name(conf.loglevel_arg); if (conf.start_time_given) { long unsigned sec, usec; if (sscanf(conf.start_time_arg, "%lu:%lu", @@ -151,7 +250,7 @@ static struct writer_node_group *check_args(void) conf.writer_arg[i], &writer_num); if (!g->writer_nodes[i].conf) goto out; - g->writer_nodes[i].writer = &writers[writer_num]; + g->writer_nodes[i].writer_num = writer_num; } ret = 1; out: @@ -176,6 +275,65 @@ __noreturn static void print_help_and_die(void) exit(0); } +/* + TODO: check wav, initial delay, multiple writers, non-default writers + */ +static int main_btr(struct sched *s) +{ + int i, ret; + struct check_wav_task_btr _cwt, *cwt = &_cwt; + struct writer_node **wns; + + sit.btrn = btr_new_node("stdin", NULL /* stdin has no parent */, NULL, NULL); + stdin_set_defaults(&sit); + register_task(&sit.task); + + 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; + cwt->task.error = 0; + register_task(&cwt->task); + + PARA_CRIT_LOG("writers:\n"); + + ret = -E_WRITE_SYNTAX; + if (!conf.writer_given) { + i = 0; + wns = para_malloc(sizeof(*wns)); + wns[0] = setup_writer_node(NULL, cwt->btrn); + if (!wns[0]) + goto out; + i = 1; + } else { + wns = para_malloc(conf.writer_given * sizeof(*wns)); + for (i = 0; i < conf.writer_given; i++) { + PARA_CRIT_LOG("i: %d\n", i); + wns[i] = setup_writer_node(conf.writer_arg[i], + cwt->btrn); + if (!wns[i]) + goto out; + } + } + + s->default_timeout.tv_sec = 10; + s->default_timeout.tv_usec = 50000; + ret = schedule(s); +out: + for (i--; i >= 0; i--) { + struct writer_node *wn = wns[i]; + struct writer *w = writers + wn->writer_num; + + w->close(wn); + btr_free_node(wn->btrn); + free(wn->conf); + free(wn); + } + free(wns); + return ret; +} + /** * Para_write's main function. * @@ -194,12 +352,16 @@ int main(int argc, char *argv[]) struct check_wav_task *cwt = &the_check_wav_task; struct initial_delay_task *idt = &the_initial_delay_task; - init_supported_writers(); + writer_init(); write_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("write", conf); if (conf.help_given || conf.detailed_help_given) print_help_and_die(); + if (conf.buffer_tree_given) { + ret = main_btr(&s); + goto out; + } wng = check_args(); if (!wng) goto out; @@ -212,7 +374,7 @@ int main(int argc, char *argv[]) sit.bufsize = conf.bufsize_arg * 1024; sit.buf = para_malloc(sit.bufsize); - wng->buf = sit.buf; + wng->bufp = &sit.buf; wng->loaded = &sit.loaded; wng->input_error = &sit.task.error;