X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=416408a1f4cfe606d858ea833f4531225c3d90db;hp=9b7a92113e69ff236e08ce235ca306c9c410fd07;hb=d6f52cebbb178c884ba54ea782efa56a009493db;hpb=5b4b082e7c37b46d5fa1729dff6496da8840085f diff --git a/write.c b/write.c index 9b7a9211..416408a1 100644 --- a/write.c +++ b/write.c @@ -1,13 +1,15 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2010 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" @@ -23,39 +26,28 @@ INIT_WRITE_ERRLISTS; -/** Check if given buffer contains a valid wave header. */ +enum check_wav_state { + CWS_NEED_HEADER, + CWS_HAVE_HEADER, + CWS_NO_HEADER, +}; + struct check_wav_task { - /** The buffer to check. */ - char *buf; - /** Number of bytes loaded in \a buf. */ - size_t *loaded; - /** Non-zero if an error occurred or end of file was reached. */ - int *input_error; + 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; -}; - -/** Delay writing until given time. */ -struct initial_delay_task { - /** The time the first data should be written out. */ - struct timeval start_time; - /** The task structure for this task. */ - struct task task; + struct btr_node *btrn; + size_t min_iqs; }; static struct write_args_info conf; static struct stdin_task sit; -static struct check_wav_task the_check_wav_task; -static struct initial_delay_task the_initial_delay_task; - -static struct writer_node_group *wng; - /** Length of a standard wav header. */ #define WAV_HEADER_LEN 44 @@ -65,101 +57,80 @@ static struct writer_node_group *wng; * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If * there is less than WAV_HEADER_LEN bytes available, return one. */ -static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) +static void check_wav_pre_select(struct sched *s, struct task *t) { struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); - unsigned char *a; int ret; - if (*cwt->loaded < WAV_HEADER_LEN) { - if (*cwt->input_error < 0) - t->error = *cwt->input_error; - return; + ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL); + if (ret != 0) + sched_min_delay(s); +} + +static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) +{ + struct check_wav_task *cwt = btr_context(btrn); + + + if (!strcmp(cmd, "samplerate")) { + if (cwt->state != CWS_HAVE_HEADER) + return -E_BTR_NAVAIL; + *result = make_message("%d", cwt->samplerate); + return 1; + } + if (!strcmp(cmd, "channels")) { + if (cwt->state != CWS_HAVE_HEADER) + return -E_BTR_NAVAIL; + *result = make_message("%d", cwt->channels); + return 1; } + return -ERRNO_TO_PARA_ERROR(ENOTSUP); +} + +static void check_wav_post_select(__a_unused struct sched *s, struct task *t) +{ + struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); + struct btr_node *btrn = cwt->btrn; + unsigned char *a; + size_t sz; + int ret; + + t->error = 0; + ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL); + if (ret <= 0) + goto out; + if (cwt->state != CWS_NEED_HEADER) + goto pushdown; + btr_merge(btrn, cwt->min_iqs); + sz = btr_next_buffer(btrn, (char **)&a); + if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */ + goto pushdown; + cwt->min_iqs = 0; cwt->channels = 2; cwt->samplerate = 44100; - a = (unsigned char*)cwt->buf; if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') { PARA_NOTICE_LOG("wav header not found\n"); - t->error = -E_NO_WAV_HEADER; + 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); - *cwt->loaded -= WAV_HEADER_LEN; - memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded); - t->error = -E_WAV_HEADER_SUCCESS; PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate); + btr_consume(btrn, WAV_HEADER_LEN); +pushdown: + btr_pushdown(btrn); out: - wng->channels = &cwt->channels; - wng->samplerate = &cwt->samplerate; - ret = wng_open(wng); + t->error = ret; if (ret < 0) - t->error = ret; - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; + btr_remove_node(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); - struct timeval diff; - - if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) { - t->error = -E_NO_DELAY; - goto register_check_wav; - } - if (tv_diff(now, &idt->start_time, &diff) > 0) { - t->error = -E_DELAY_TIMEOUT; - goto register_check_wav; - } - if (tv_diff(&s->timeout , &diff, NULL) > 0) - s->timeout = diff; - return; -register_check_wav: - register_task(&the_check_wav_task.task); - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - -INIT_STDERR_LOGGING(conf.loglevel_arg) - -static struct writer_node_group *check_args(void) -{ - int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *g = NULL; - struct initial_delay_task *idt = &the_initial_delay_task; - - if (conf.start_time_given) { - long unsigned sec, usec; - if (sscanf(conf.start_time_arg, "%lu:%lu", - &sec, &usec) != 2) - goto out; - idt->start_time.tv_sec = sec; - idt->start_time.tv_usec = usec; - } - if (!conf.writer_given) { - g = setup_default_wng(); - ret = 1; - goto out; - } - g = wng_new(conf.writer_given); - ret = -E_WRITE_SYNTAX; - for (i = 0; i < conf.writer_given; i++) { - int writer_num; - g->writer_nodes[i].conf = check_writer_arg( - conf.writer_arg[i], &writer_num); - if (!g->writer_nodes[i].conf) - goto out; - g->writer_nodes[i].writer = &writers[writer_num]; - } - ret = 1; -out: - if (ret > 0) - return g; - free(g); - return NULL; -} +static int loglevel; +INIT_STDERR_LOGGING(loglevel) __noreturn static void print_help_and_die(void) { @@ -176,14 +147,72 @@ __noreturn static void print_help_and_die(void) exit(0); } +static int main_btr(struct sched *s) +{ + int i, ret; + struct check_wav_task _cwt, *cwt = &_cwt; + struct writer_node *wns; + + loglevel = get_loglevel_by_name(conf.loglevel_arg); + sit.btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + stdin_set_defaults(&sit); + register_task(&sit.task); + + cwt->state = CWS_NEED_HEADER; + cwt->min_iqs = WAV_HEADER_LEN; + cwt->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "check_wav", .parent = sit.btrn, + .handler = check_wav_exec, .context = cwt)); + sprintf(cwt->task.status, "check_wav"); + cwt->task.pre_select = check_wav_pre_select; + cwt->task.post_select = check_wav_post_select; + cwt->task.error = 0; + register_task(&cwt->task); + + ret = -E_WRITE_SYNTAX; + if (!conf.writer_given) { + i = 0; + wns = para_calloc(sizeof(*wns)); + ret = setup_writer_node(NULL, cwt->btrn, wns); + if (ret < 0) + goto out; + i = 1; + } else { + wns = para_calloc(conf.writer_given * sizeof(*wns)); + for (i = 0; i < conf.writer_given; i++) { + ret = setup_writer_node(conf.writer_arg[i], + cwt->btrn, wns + i); + if (ret < 0) + 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(wns); + btr_free_node(cwt->btrn); + return ret; +} + /** * Para_write's main function. * * \param argc The usual argument counter. * \param argv The usual argument vector. * - * It registers the stdin task, the check_wav_task, the task for initial delay - * and all tasks for actually writing out the stream. + * It sets up and starts the tasks and the buffer tree nodes determined by + * command line options. * * \return \p EXIT_SUCCESS or EXIT_FAILURE */ @@ -191,48 +220,14 @@ int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; static struct sched s; - 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(); - wng = check_args(); - if (!wng) - goto out; - stdin_set_defaults(&sit); - ret = -ERRNO_TO_PARA_ERROR(EINVAL); - if (conf.bufsize_arg < 0) - goto out; - if (conf.bufsize_arg >= INT_MAX / 1024) - goto out; - sit.bufsize = conf.bufsize_arg * 1024; - sit.buf = para_malloc(sit.bufsize); - - wng->buf = sit.buf; - wng->loaded = &sit.loaded; - wng->input_error = &sit.task.error; - - register_task(&sit.task); - - cwt->buf = sit.buf; - cwt->loaded = &sit.loaded; - cwt->input_error = &sit.task.error; - sprintf(cwt->task.status, "check wav"); - cwt->task.pre_select = check_wav_pre_select; - - idt->task.pre_select = initial_delay_pre_select; - sprintf(idt->task.status, "initial_delay"); - register_task(&idt->task); - - s.default_timeout.tv_sec = 10; - s.default_timeout.tv_usec = 0; - ret = schedule(&s); - wng_close(wng); -out: + ret = main_btr(&s); if (ret < 0) { PARA_ERROR_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE);