X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=c692dc92fe1a77433aad26078879555a93bb39c6;hp=79aaef3112931579fca863dd4484e1dc460817f1;hb=335730538150250f32c0df0b184fb494e2bb0df3;hpb=19afe4270372d36eddc567dfc7d37db5806e02a7 diff --git a/write.c b/write.c index 79aaef31..c692dc92 100644 --- a/write.c +++ b/write.c @@ -1,178 +1,127 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2008 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 "stdin.h" #include "write.h" #include "write_common.h" #include "fd.h" - -#include /* gettimeofday */ - #include "error.h" -#define WAV_HEADER_LEN 44 - -static unsigned char *audiobuf; -static struct timeval *start_time; -struct gengetopt_args_info conf; - INIT_WRITE_ERRLISTS; -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); -} +/** 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; + 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 struct writer_node_group *wng; + +/** Length of a standard wav header. */ +#define WAV_HEADER_LEN 44 /** - * read WAV_HEADER_LEN bytes from stdin to audio buffer + * Test if audio buffer contains a valid wave header. * - * \return -E_READ_HDR on errors and on eof before WAV_HEADER_LEN could be - * read. A positive return value indicates success. + * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If + * there is less than WAV_HEADER_LEN bytes available, return one. */ -static int read_wav_header(void) +static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) { - ssize_t ret, count = 0; + struct check_wav_task *cwt = container_of(t, struct check_wav_task, task); + unsigned char *a; + int ret; - while (count < WAV_HEADER_LEN) { - ret = read(STDIN_FILENO, audiobuf + count, WAV_HEADER_LEN - count); - if (ret <= 0) - return -E_READ_HDR; - count += ret; + if (*cwt->loaded < WAV_HEADER_LEN) { + if (*cwt->input_error < 0) + t->error = *cwt->input_error; + return; } - return 1; -} - -/** - * check if current time is later than start_time - * \param diff pointer to write remaining time to - * - * If start_time was not given, or current time is later than given - * start_time, return 0. Otherwise, return 1 and write the time - * difference between current time and start_time to diff. diff may be - * NULL. - * - */ -static int start_time_in_future(struct timeval *diff) -{ - struct timeval now; - - if (!conf.start_time_given) - return 0; - gettimeofday(&now, NULL); - return tv_diff(start_time, &now, diff) > 0? 1 : 0; -} - -/** - * sleep until time given at command line - * - * This is called if the initial buffer is filled. It returns - * immediately if no start_time was given at the command line - * or if the given start time is in the past. - * - */ -static void do_initial_delay(struct timeval *delay) -{ - do - para_select(1, NULL, NULL, delay); - while (start_time_in_future(delay)); + 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 int read_stdin(char *buf, size_t bytes_to_load, size_t *loaded) +static void initial_delay_pre_select(struct sched *s, struct task *t) { - ssize_t ret; + struct initial_delay_task *idt = container_of(t, struct initial_delay_task, task); + struct timeval diff; - while (*loaded < bytes_to_load) { - ret = read(STDIN_FILENO, buf + *loaded, bytes_to_load - *loaded); - if (ret <= 0) { - if (ret < 0) - ret = -E_READ_STDIN; - return ret; - } - *loaded += ret; + if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) { + t->error = -E_NO_DELAY; + return; } - return 1; -} -/** - * play raw pcm data - * \param loaded number of bytes already loaded - * - * If start_time was given, prebuffer data until buffer is full or - * start_time is reached. In any case, do not start playing before - * start_time. - * - * \return positive on success, negative on errors. - */ -static int pcm_write(struct writer_node_group *wng, size_t loaded) -{ - size_t bufsize, prebuf_size, bytes_to_load; - struct timeval delay; - int ret, not_yet_started = 1; - - ret = wng_open(wng); - if (ret < 0) - goto out; - PARA_INFO_LOG("max chunk_bytes: %d\n", wng->max_chunk_bytes); - bufsize = (conf.bufsize_arg * 1024 / wng->max_chunk_bytes) - * wng->max_chunk_bytes; - audiobuf = para_realloc(audiobuf, bufsize); - prebuf_size = conf.prebuffer_arg * bufsize / 100; - bytes_to_load = PARA_MAX(prebuf_size, wng->max_chunk_bytes); - ret = read_stdin(audiobuf, bytes_to_load, &loaded); - if (ret <= 0 || loaded < bytes_to_load) { - if (ret >= 0) - ret = -E_PREMATURE_END; - goto out; + if (tv_diff(now, &idt->start_time, &diff) > 0) { + t->error = -E_DELAY_TIMEOUT; + return; } - if (not_yet_started && start_time && start_time_in_future(&delay)) - do_initial_delay(&delay); - not_yet_started = 0; -again: - ret = wng_write(wng, audiobuf, &loaded); - if (ret <= 0) - goto out; - ret = -E_WRITE_OVERRUN; - if (loaded >= bufsize) - goto out; - bytes_to_load = PARA_MIN(wng->max_chunk_bytes, bufsize); - ret = read_stdin(audiobuf, bytes_to_load, &loaded); - if (ret < 0) - goto out; - if (!ret) - wng->eof = 1; - goto again; -out: - wng_close(wng); - return ret; + if (tv_diff(&s->timeout , &diff, NULL) > 0) + s->timeout = diff; } +INIT_STDERR_LOGGING(conf.loglevel_arg) + static struct writer_node_group *check_args(void) { int i, ret = -E_WRITE_SYNTAX; - static struct timeval tv; - struct writer_node_group *wng = NULL; + struct writer_node_group *g = NULL; + struct initial_delay_task *idt = &the_initial_delay_task; if (conf.list_writers_given) { char *msg = NULL; @@ -188,72 +137,92 @@ static struct writer_node_group *check_args(void) free(msg); exit(EXIT_SUCCESS); } - if (conf.prebuffer_arg < 0 || conf.prebuffer_arg > 100) - goto out; if (conf.start_time_given) { long unsigned sec, usec; if (sscanf(conf.start_time_arg, "%lu:%lu", &sec, &usec) != 2) goto out; - tv.tv_sec = sec; - tv.tv_usec = usec; - start_time = &tv; + 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++) { - ret = check_writer_arg(conf.writer_arg[i]); - if (ret < 0) + 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; - wng->writer_nodes[i].writer = &writers[ret]; + g->writer_nodes[i].writer = &writers[writer_num]; } ret = 1; out: if (ret > 0) - return wng; - free(wng); + return g; + free(g); return NULL; } /** - * test if audio buffer contains a valid wave header + * Para_write's main function. + * + * \param argc The usual argument counter. + * \param argv The usual argument vector. * - * \return If not, return 0, otherwise, store number of channels and sample rate - * in struct conf and return WAV_HEADER_LEN. + * 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 */ -static size_t check_wave(void) -{ - unsigned char *a = audiobuf; - if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') - return WAV_HEADER_LEN; - conf.channels_arg = (unsigned) a[22]; - conf.sample_rate_arg = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); - return 0; -} - int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; - struct writer_node_group *wng = NULL; + 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); + init_supported_writers(); - cmdline_parser(argc, argv, &conf); wng = check_args(); if (!wng) goto out; - init_supported_writers(); - audiobuf = para_malloc(WAV_HEADER_LEN); - ret = read_wav_header(); - if (ret < 0) - goto out; - ret = pcm_write(wng, check_wave()); + 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; + + 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: - wng_destroy(wng); - free(audiobuf); - if (ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - return ret; + if (ret < 0) { + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); + } + exit(EXIT_SUCCESS); }