X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=3deef1474c840a48e88d4db6717b0d446a1e994b;hp=34cea48c6a81ab2d7d6743e28706181415362824;hb=f652ce6afe7f6fd0e42814505234cbf4321a736e;hpb=fcb24360b1b14c9fe0e510282cf85f4e112eaf23 diff --git a/write.c b/write.c index 34cea48c..3deef147 100644 --- a/write.c +++ b/write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "string.h" @@ -17,166 +16,146 @@ #include "sched.h" #include "ggo.h" #include "stdin.h" +#include "buffer_tree.h" #include "write.h" #include "write_common.h" #include "fd.h" #include "error.h" +#include "version.h" +#include "check_wav.h" INIT_WRITE_ERRLISTS; -/** Check if given buffer contains a valid wave 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; - /** 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; -}; - 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 int loglevel; +INIT_STDERR_LOGGING(loglevel) -static struct writer_node_group *wng; +__noreturn static void print_help_and_die(void) +{ + int d = conf.detailed_help_given; + const char **p = d? write_args_info_detailed_help + : write_args_info_help; -/** Length of a standard wav header. */ -#define WAV_HEADER_LEN 44 + printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-" + WRITE_CMDLINE_PARSER_VERSION); + printf_or_die("%s\n\n", write_args_info_usage); + for (; *p; p++) + printf_or_die("%s\n", *p); + print_writer_helps(d); + exit(0); +} -/** - * Test if audio buffer contains a valid wave header. +/* + * Parse config and register a task for a writer node. + * + * \param arg Command line arguments. + * \param parent The new node will be a child of \a parent. + * \param wn The writer node. + * + * If arg is \p NULL, the OS-dependent default writer is used with no + * arguments. The default writers are alsa for Linux, osx for OS X, oss for + * *BSD, and the file writer if the default writer is not supported. + * + * Once the writer configuration has been retrieved from the ->parse_config + * callback a writer node is created, its buffer tree node is added to the + * buffer tree as a child of the given parent. + * + * Finally, the new writer node's task structure is initialized and registered + * to the paraslash scheduler. * - * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If - * there is less than WAV_HEADER_LEN bytes available, return one. + * \return Standard. */ -static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) +static void setup_writer_node(const char *arg, struct btr_node *parent, + struct writer_node *wn, struct sched *s) { - 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; - } - 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; - goto out; - } - 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); -out: - wng->channels = &cwt->channels; - wng->samplerate = &cwt->samplerate; - ret = wng_open(wng); - if (ret < 0) - t->error = ret; - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; + wn->conf = check_writer_arg_or_die(arg, &wn->writer_num); + register_writer_node(wn, parent, s); } -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; +struct write_task { + struct task task; + struct check_wav_context *cwc; +}; - 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; +static void write_pre_select(struct sched *s, struct task *t) +{ + struct write_task *wt = container_of(t, struct write_task, task); + check_wav_pre_select(s, wt->cwc); } -static int loglevel; -INIT_STDERR_LOGGING(loglevel) +static void write_post_select(__a_unused struct sched *s, struct task *t) +{ + struct write_task *wt = container_of(t, struct write_task, task); + t->error = check_wav_post_select(wt->cwc); +} -static struct writer_node_group *check_args(void) +static int setup_and_schedule(void) { - int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *g = NULL; - struct initial_delay_task *idt = &the_initial_delay_task; + int i, ret; + struct btr_node *cw_btrn; + struct writer_node *wns; + static struct sched s; + struct wav_params wp; + struct write_task wt = { + .task = { + .pre_select = write_pre_select, + .post_select = write_post_select, + .status = "write 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", - &sec, &usec) != 2) - goto out; - idt->start_time.tv_sec = sec; - idt->start_time.tv_usec = usec; - } + sit.btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + stdin_set_defaults(&sit); + register_task(&s, &sit.task); + + COPY_WAV_PARMS(&wp, &conf); + wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn); + register_task(&s, &wt.task); 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_num = writer_num; + wns = para_calloc(sizeof(*wns)); + setup_writer_node(NULL, cw_btrn, wns, &s); + i = 1; + } else { + wns = para_calloc(conf.writer_given * sizeof(*wns)); + for (i = 0; i < conf.writer_given; i++) + setup_writer_node(conf.writer_arg[i], cw_btrn, + wns + i, &s); } - ret = 1; -out: - if (ret > 0) - return g; - free(g); - return NULL; -} - -__noreturn static void print_help_and_die(void) -{ - int d = conf.detailed_help_given; - const char **p = d? write_args_info_detailed_help - : write_args_info_help; - printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-" - WRITE_CMDLINE_PARSER_VERSION); - printf_or_die("%s\n\n", write_args_info_usage); - for (; *p; p++) - printf_or_die("%s\n", *p); - print_writer_helps(d); - exit(0); + s.default_timeout.tv_sec = 10; + s.default_timeout.tv_usec = 50000; + ret = schedule(&s); + if (ret >= 0) { + int j; + for (j = 0; j < i; j++) { + struct task *t = &wns[j].task; + assert(t->error < 0); + if (t->error != -E_WRITE_COMMON_EOF + && t->error != -E_BTR_EOF) { + PARA_ERROR_LOG("%s: %s\n", t->status, + para_strerror(-t->error)); + if (ret >= 0) + ret = t->error; + } + } + } + for (i--; i >= 0; i--) { + struct writer_node *wn = wns + i; + struct writer *w = writers + wn->writer_num; + + w->close(wn); + btr_remove_node(&wn->btrn); + w->free_config(wn->conf); + free(wn->conf); + } + free(wns); + check_wav_shutdown(wt.cwc); + return ret; } /** @@ -185,17 +164,14 @@ __noreturn static void print_help_and_die(void) * \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 */ 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; + int ret; writer_init(); write_cmdline_parser(argc, argv, &conf); @@ -203,39 +179,7 @@ int main(int argc, char *argv[]) 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->bufp = &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 = setup_and_schedule(); if (ret < 0) { PARA_ERROR_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE);