X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=dda1b705c19151000dd08098f99d2b9d4c71f11c;hp=78e48dcdaf5637acf5754a00553a28c5d647284e;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=591b16bbe13ca336c4cef00e8f9f808c1bb4c9a0 diff --git a/write.c b/write.c index 78e48dcd..dda1b705 100644 --- a/write.c +++ b/write.c @@ -1,20 +1,24 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2011 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" #include "write.cmdline.h" #include "list.h" #include "sched.h" +#include "ggo.h" #include "stdin.h" +#include "buffer_tree.h" #include "write.h" #include "write_common.h" #include "fd.h" @@ -22,151 +26,201 @@ 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, +}; + +/* Information extracted from the wav 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. */ + int state; + /** Number of channels. */ unsigned channels; + unsigned sample_format; /** Sample rate specified in wav header given by \a buf. */ - unsigned samplerate; + unsigned sample_rate; /** 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 -/** - * Test if audio buffer contains a valid wave header. - * - * \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); + int ret; + + ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL); + if (ret != 0) + sched_min_delay(s); +} + +#define HANDLE_EXEC(_cmd) \ + if (!strcmp(cmd, #_cmd)) { \ + if (!conf._cmd ## _given && cwt->state == CWS_NEED_HEADER) \ + return -E_BTR_NAVAIL; \ + *result = make_message("%d", cwt->state == CWS_NO_HEADER || conf._cmd ## _given? \ + conf._cmd ## _arg : cwt->_cmd); \ + return 1; \ + } \ + + +static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) +{ + struct check_wav_task *cwt = btr_context(btrn); + + HANDLE_EXEC(sample_rate); + HANDLE_EXEC(channels); + HANDLE_EXEC(sample_format); + 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; + uint16_t bps; /* bits per sample */ + const char *sample_formats[] = {SAMPLE_FORMATS}; - 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') { + 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; + /* + * The default byte ordering assumed for WAVE data files is + * little-endian. Files written using the big-endian byte ordering + * scheme have the identifier RIFX instead of RIFF. + */ + if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || + (a[3] != 'F' && a[3] != 'X')) { 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); + cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); + bps = a[34] + ((unsigned)a[35] << 8); + if (bps != 8 && bps != 16) { + PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps); + bps = 16; + } + /* + * 8-bit samples are stored as unsigned bytes, ranging from 0 to 255. + * 16-bit samples are stored as 2's-complement signed integers, ranging + * from -32768 to 32767. + */ + if (bps == 8) + cwt->sample_format = SF_U8; + else + cwt->sample_format = (a[3] == 'F')? SF_S16_LE : SF_S16_BE; + PARA_NOTICE_LOG("%dHz, %s, %s\n", cwt->sample_rate, + cwt->channels == 1? "mono" : "stereo", + sample_formats[cwt->sample_format]); + 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; +static int loglevel; +INIT_STDERR_LOGGING(loglevel) - if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) { - t->error = -E_NO_DELAY; - return; - } - if (tv_diff(now, &idt->start_time, &diff) > 0) { - t->error = -E_DELAY_TIMEOUT; - return; - } - if (tv_diff(&s->timeout , &diff, NULL) > 0) - s->timeout = diff; +__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); } -INIT_STDERR_LOGGING(conf.loglevel_arg) - -static struct writer_node_group *check_args(void) +static int main_btr(struct sched *s) { - int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *g = NULL; - struct initial_delay_task *idt = &the_initial_delay_task; - - if (conf.list_writers_given) { - char *msg = NULL; - FOR_EACH_WRITER(i) { - char *tmp = make_message("%s%s%s", - i? msg : "", - i? " " : "", - writer_names[i]); - free(msg); - msg = tmp; - } - fprintf(stderr, "%s\n", msg); - free(msg); - exit(EXIT_SUCCESS); - } - 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); + 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; - 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) + if (!conf.writer_given) { + i = 0; + wns = para_calloc(sizeof(*wns)); + ret = setup_writer_node(NULL, cwt->btrn, wns); + if (ret < 0) goto out; - g->writer_nodes[i].writer = &writers[writer_num]; + 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; + } } - ret = 1; + + s->default_timeout.tv_sec = 10; + s->default_timeout.tv_usec = 50000; + ret = schedule(s); out: - if (ret > 0) - return g; - free(g); - return NULL; + 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; } /** @@ -175,8 +229,8 @@ out: * \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 */ @@ -184,43 +238,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; + writer_init(); write_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("write", conf); - init_supported_writers(); - - wng = check_args(); - if (!wng) - goto out; - stdin_set_defaults(&sit); - if (conf.bufsize_given) - sit.bufsize = conf.bufsize_arg; - sit.buf = para_malloc(sit.bufsize); - - wng->buf = sit.buf; - wng->loaded = &sit.loaded; - wng->input_error = &sit.task.error; + if (conf.help_given || conf.detailed_help_given) + print_help_and_die(); - 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; - register_task(&cwt->task); - - 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);