X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=3b5f2d193f31ddc1d8c130703637810f807f255f;hp=d88633592127aa3ac7f037b6351854d95b3e7129;hb=b307a25ed895caa33684302b502e9e0e70dc78b7;hpb=f42b5eccb6ec3364dc0500ffeffbe9d9ecab07bd diff --git a/write.c b/write.c index d8863359..3b5f2d19 100644 --- a/write.c +++ b/write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include #include "para.h" @@ -23,6 +22,7 @@ #include "write_common.h" #include "fd.h" #include "error.h" +#include "version.h" INIT_WRITE_ERRLISTS; @@ -32,12 +32,14 @@ enum check_wav_state { CWS_NO_HEADER, }; +/* Information extracted from the wav header. */ struct check_wav_task { int state; - /** Number of channels specified in wav header given by \a buf. */ + /** 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; struct btr_node *btrn; @@ -51,12 +53,6 @@ static struct stdin_task sit; /** 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(struct sched *s, struct task *t) { struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); @@ -67,23 +63,23 @@ static void check_wav_pre_select(struct sched *s, struct task *t) 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); - - 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; - } + HANDLE_EXEC(sample_rate); + HANDLE_EXEC(channels); + HANDLE_EXEC(sample_format); return -ERRNO_TO_PARA_ERROR(ENOTSUP); } @@ -94,6 +90,8 @@ static void check_wav_post_select(__a_unused struct sched *s, struct task *t) unsigned char *a; size_t sz; int ret; + uint16_t bps; /* bits per sample */ + const char *sample_formats[] = {SAMPLE_FORMATS}; t->error = 0; ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL); @@ -106,9 +104,13 @@ static void check_wav_post_select(__a_unused struct sched *s, struct task *t) if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */ goto pushdown; cwt->min_iqs = 0; - cwt->channels = 2; - cwt->samplerate = 44100; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') { + /* + * 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"); cwt->state = CWS_NO_HEADER; sprintf(t->status, "check wav: no header"); @@ -118,8 +120,24 @@ static void check_wav_post_select(__a_unused struct sched *s, struct task *t) 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); + 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); @@ -147,11 +165,44 @@ __noreturn static void print_help_and_die(void) exit(0); } -static int main_btr(struct sched *s) +/* + * 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 Standard. + */ +static void setup_writer_node(const char *arg, struct btr_node *parent, + struct writer_node *wn) +{ + if (arg) + wn->conf = check_writer_arg_or_die(arg, &wn->writer_num); + else { + wn->writer_num = DEFAULT_WRITER; + wn->conf = writers[DEFAULT_WRITER].parse_config_or_die(""); + } + register_writer_node(wn, parent); +} + +static int setup_and_schedule(void) { int i, ret; struct check_wav_task _cwt, *cwt = &_cwt; struct writer_node *wns; + static struct sched s; loglevel = get_loglevel_by_name(conf.loglevel_arg); sit.btrn = btr_new_node(&(struct btr_node_description) @@ -170,34 +221,41 @@ static int main_btr(struct sched *s) 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; + setup_writer_node(NULL, cwt->btrn, wns); 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; - } + for (i = 0; i < conf.writer_given; i++) + setup_writer_node(conf.writer_arg[i], cwt->btrn, + wns + i); } - s->default_timeout.tv_sec = 10; - s->default_timeout.tv_usec = 50000; - ret = schedule(s); -out: + 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_free_node(wn->btrn); + w->free_config(wn->conf); free(wn->conf); } free(wns); @@ -218,8 +276,7 @@ out: */ int main(int argc, char *argv[]) { - int ret = -E_WRITE_SYNTAX; - static struct sched s; + int ret; writer_init(); write_cmdline_parser(argc, argv, &conf); @@ -227,7 +284,7 @@ int main(int argc, char *argv[]) if (conf.help_given || conf.detailed_help_given) print_help_and_die(); - ret = main_btr(&s); + ret = setup_and_schedule(); if (ret < 0) { PARA_ERROR_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE);