X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=c692dc92fe1a77433aad26078879555a93bb39c6;hp=a3b1de1c2ceefac4ac4d152cdf54df9658341d13;hb=78882bd94652b156e55e6385a33cd5126c439651;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a diff --git a/write.c b/write.c index a3b1de1c..c692dc92 100644 --- a/write.c +++ b/write.c @@ -1,10 +1,10 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file write.c Paraslash's standalone wav/raw player */ +/** \file write.c Paraslash's standalone wav/raw player. */ #include #include @@ -22,84 +22,95 @@ INIT_WRITE_ERRLISTS; -/** - * check if given buffer contains a valid wave header - */ +/** Check if given buffer contains a valid wave header. */ struct check_wav_task { - /** the buffer to check */ + /** The buffer to check. */ char *buf; - /** number of bytes loaded in \a buf */ + /** Number of bytes loaded in \a buf. */ size_t *loaded; - /** non-zero if end of file was reached */ - int *eof; - /** number of channels specified in wav header given by \a buf */ + /** 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; - /** samplerate specified in wav header given by \a buf */ + /** Sample rate specified in wav header given by \a buf. */ unsigned samplerate; - /** the task structure for this task */ struct task task; }; -/** - * delay writing until given time - */ +/** Delay writing until given time. */ struct initial_delay_task { - /** the time the first data should be written out */ + /** The time the first data should be written out. */ struct timeval start_time; - /** the task structure for this task */ + /** 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 cwt; -static struct initial_delay_task idt; + +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 */ +/** Length of a standard wav header. */ #define WAV_HEADER_LEN 44 /** - * test if audio buffer contains a valid wave header + * 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 awailable, return one. + * 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) { - struct check_wav_task *wt = t->private_data; + struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); unsigned char *a; + int ret; - if (*wt->loaded < WAV_HEADER_LEN) { - t->ret = *wt->eof? -E_PREMATURE_END : 1; + if (*cwt->loaded < WAV_HEADER_LEN) { + if (*cwt->input_error < 0) + t->error = *cwt->input_error; return; } - wt->channels = 2; - wt->samplerate = 44100; - a = (unsigned char*)wt->buf; - t->ret = -E_NO_WAV_HEADER; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') - return; - wt->channels = (unsigned) a[22]; - wt->samplerate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); - *wt->loaded -= WAV_HEADER_LEN; - memmove(wt->buf, wt->buf + WAV_HEADER_LEN, *wt->loaded); - t->ret = -E_WAV_HEADER_SUCCESS; - PARA_INFO_LOG("channels: %d, sample rate: %d\n", wt->channels, wt->samplerate); + 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; } static void initial_delay_pre_select(struct sched *s, struct task *t) { - struct initial_delay_task *dt = t->private_data; + struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task); struct timeval diff; - t->ret = -E_NO_DELAY; - if (!dt->start_time.tv_sec && !dt->start_time.tv_usec) + if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) { + t->error = -E_NO_DELAY; return; - t->ret = -E_DELAY_TIMEOUT; - if (tv_diff(now, &dt->start_time, &diff) > 0) + } + if (tv_diff(now, &idt->start_time, &diff) > 0) { + t->error = -E_DELAY_TIMEOUT; return; - t->ret = 1; + } if (tv_diff(&s->timeout , &diff, NULL) > 0) s->timeout = diff; } @@ -110,6 +121,7 @@ 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.list_writers_given) { char *msg = NULL; @@ -130,8 +142,8 @@ static struct writer_node_group *check_args(void) 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; + idt->start_time.tv_sec = sec; + idt->start_time.tv_usec = usec; } if (!conf.writer_given) { g = setup_default_wng(); @@ -156,59 +168,11 @@ out: return NULL; } -static void wng_event_handler(struct task *t) -{ - struct writer_node_group *g = t->private_data; - - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); - unregister_task(t); - wng_close(g); -} - - -static void idt_event_handler(struct task *t) -{ - int ret; - - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); - unregister_task(t); - wng->buf = sit.buf; - wng->loaded = &sit.loaded; - wng->input_eof = &sit.eof; - wng->task.event_handler = wng_event_handler; - wng->channels = &cwt.channels; - wng->samplerate = &cwt.samplerate; - ret = wng_open(wng); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - exit(EXIT_FAILURE); - } -} - -static void cwt_event_handler(struct task *t) -{ - if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret)); - exit(EXIT_FAILURE); - } - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); - unregister_task(t); -// if (t->ret == -E_WAV_HEADER_SUCCESS) { -// conf.channels_arg = cwt.channels; -// conf.sample_rate_arg = cwt.sample_rate; -// } - idt.task.pre_select = initial_delay_pre_select; - idt.task.private_data = &idt; - idt.task.event_handler = idt_event_handler; - sprintf(idt.task.status, "initial_delay"); - register_task(&idt.task); -} - /** - * para_write's main function + * Para_write's main function. * - * \param argc the usual argument counter - * \param argv the usual argument vector + * \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. @@ -219,6 +183,8 @@ int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; struct sched s; + struct check_wav_task *cwt = &the_check_wav_task; + struct initial_delay_task *idt = &the_initial_delay_task; write_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("write", conf); @@ -230,27 +196,33 @@ int main(int argc, char *argv[]) stdin_set_defaults(&sit); if (conf.bufsize_given) sit.bufsize = conf.bufsize_arg; - sit.buf = para_malloc(sit.bufsize), + 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.task.pre_select = check_wav_pre_select; - cwt.task.private_data = &cwt; - cwt.task.event_handler = cwt_event_handler; - cwt.buf = sit.buf; - cwt.loaded = &sit.loaded; - cwt.eof = &sit.eof; - sprintf(cwt.task.status, "check wav"); - register_task(&cwt.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); - s.default_timeout.tv_sec = 1; - s.default_timeout.tv_usec = 0; - ret = sched(&s); + 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: if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - ret = EXIT_FAILURE; - } else - ret = EXIT_SUCCESS; - return ret; + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); + } + exit(EXIT_SUCCESS); }