X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=c12736a66bfb81c9dcf85c412b1a581a2cade0ce;hp=56b4401a53e3c418a250505d2e188cf7ce61da19;hb=c00d7e25de7006d6f88aafb2b485057377a70324;hpb=7d1805d1559e08e0af701155574aef220925d411 diff --git a/write.c b/write.c index 56b4401a..c12736a6 100644 --- a/write.c +++ b/write.c @@ -1,26 +1,20 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2009 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ +/** \file write.c Paraslash's standalone wav/raw player. */ + +#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 "write.h" #include "write_common.h" @@ -29,220 +23,221 @@ 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; - int *eof; + /** 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 gengetopt_args_info conf; -struct stdin_task sit; -struct check_wav_task cwt; -struct initial_delay_task idt; +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 + * 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 *cwt = t->private_data; + struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); unsigned char *a; + int ret; if (*cwt->loaded < WAV_HEADER_LEN) { - t->ret = *cwt->eof? -E_PREMATURE_END : 1; + if (*cwt->input_error < 0) + t->error = *cwt->input_error; return; } cwt->channels = 2; cwt->samplerate = 44100; a = (unsigned char*)cwt->buf; - t->ret = -E_NO_WAV_HEADER; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') - return; + 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->ret = -E_WAV_HEADER_SUCCESS; + 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 *idt = 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 (!idt->start_time.tv_sec && !idt->start_time.tv_usec) - return; - t->ret = -E_DELAY_TIMEOUT; - if (tv_diff(now, &idt->start_time, &diff) > 0) - return; - t->ret = 1; + 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; } -void para_log(int ll, const char* fmt,...) -{ - va_list argp; - - if (ll < conf.loglevel_arg) - return; - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); -} +static int loglevel; +INIT_STDERR_LOGGING(loglevel) static struct writer_node_group *check_args(void) { int i, ret = -E_WRITE_SYNTAX; - struct writer_node_group *wng = NULL; - - 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.prebuffer_arg < 0 || conf.prebuffer_arg > 100) -// goto out; + struct writer_node_group *g = NULL; + struct initial_delay_task *idt = &the_initial_delay_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; + idt->start_time.tv_sec = sec; + idt->start_time.tv_usec = usec; } if (!conf.writer_given) { - wng = setup_default_wng(); + g = setup_default_wng(); ret = 1; goto out; } - wng = wng_new(conf.writer_given); + g = wng_new(conf.writer_given); ret = -E_WRITE_SYNTAX; for (i = 0; i < conf.writer_given; i++) { int writer_num; - wng->writer_nodes[i].conf = check_writer_arg( + g->writer_nodes[i].conf = check_writer_arg( conf.writer_arg[i], &writer_num); - if (!wng->writer_nodes[i].conf) + if (!g->writer_nodes[i].conf) goto out; - wng->writer_nodes[i].writer = &writers[writer_num]; + g->writer_nodes[i].writer_num = writer_num; } ret = 1; out: if (ret > 0) - return wng; - free(wng); + return g; + free(g); 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) +__noreturn static void print_help_and_die(void) { - 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); + 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); } +/** + * 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. + * + * \return \p EXIT_SUCCESS or EXIT_FAILURE + */ int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; - struct sched s; + static struct sched s; + struct check_wav_task *cwt = &the_check_wav_task; + struct initial_delay_task *idt = &the_initial_delay_task; - cmdline_parser(argc, argv, &conf); - init_supported_writers(); - init_sched(); + 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); - if (conf.bufsize_given) - sit.bufsize = conf.bufsize_arg; - sit.buf = para_malloc(sit.bufsize), + 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.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; - 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); }