From: Andre Noll Date: Wed, 13 Jan 2010 20:46:28 +0000 (+0100) Subject: write: Kill non-btr mode. X-Git-Tag: v0.4.2~112 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f1401e9c2d74154a81d16e2d1a2413e7125abb15;hp=49c897ce4cffb9ab355540043cd85d22d9a78299 write: Kill non-btr mode. Yes, this breaks the build on Macs. Sue me. --- diff --git a/ggo/buffer_tree.m4 b/ggo/buffer_tree.m4 deleted file mode 100644 index 7cf6fbe8..00000000 --- a/ggo/buffer_tree.m4 +++ /dev/null @@ -1,9 +0,0 @@ - -option "buffer_tree" B -#~~~~~~~~~~~~~~~~~~~~~ -"use the new buffer tree API" -flag off -details = " - Experimental. Don't use. -" - diff --git a/ggo/makefile b/ggo/makefile index 44e247ae..d4f3a8cd 100644 --- a/ggo/makefile +++ b/ggo/makefile @@ -57,7 +57,7 @@ $(ggo_dir)/audioc.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/filter.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/fsck.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/gui.ggo: $(ggo_dir)/loglevel.m4 -$(ggo_dir)/recv.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/buffer_tree.m4 +$(ggo_dir)/recv.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/write.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/client.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/config_file.m4 diff --git a/ggo/write.m4 b/ggo/write.m4 index e7faebcc..d954316a 100644 --- a/ggo/write.m4 +++ b/ggo/write.m4 @@ -1,13 +1,5 @@ include(header.m4) include(loglevel.m4) -include(buffer_tree.m4) - -option "bufsize" b -#~~~~~~~~~~~~~~~~~ -"input buffer size" -int typestr="kilobytes" -default="64" -optional option "writer" w #~~~~~~~~~~~~~~~~ @@ -20,13 +12,3 @@ details=" May be give multiple times. The same writer may be specified more than once. " - -option "start_time" t -#~~~~~~~~~~~~~~~~~~~~ -"defer playback" -string typestr="timeval" -optional -details=" - Start playback at given time which must be in a:b format where - a denotes seconds and b denotes microseconds since the epoch. -" diff --git a/write.c b/write.c index c64ecb63..103f2acc 100644 --- a/write.c +++ b/write.c @@ -26,29 +26,13 @@ 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; - /** 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; -}; - enum check_wav_state { CWS_NEED_HEADER, CWS_HAVE_HEADER, CWS_NO_HEADER, }; -struct check_wav_task_btr { +struct check_wav_task { int state; /** Number of channels specified in wav header given by \a buf. */ unsigned channels; @@ -57,25 +41,13 @@ struct check_wav_task_btr { /** The task structure used by the scheduler. */ struct task task; struct btr_node *btrn; -}; - -/** 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; + 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 @@ -85,54 +57,19 @@ static struct writer_node_group *wng; * \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); - unsigned char *a; int ret; - 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') { - 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 check_wav_pre_select_btr(__a_unused struct sched *s, struct task *t) -{ - struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task); - - if (btr_get_input_queue_size(cwt->btrn) < WAV_HEADER_LEN) - return; - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; + ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL); + if (ret != 0) + sched_min_delay(s); } static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) { - struct check_wav_task_btr *cwt = btr_context(btrn); + struct check_wav_task *cwt = btr_context(btrn); if (!strcmp(cmd, "samplerate")) { @@ -150,28 +87,27 @@ static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result) return -ERRNO_TO_PARA_ERROR(ENOTSUP); } -static void check_wav_post_select_btr(__a_unused struct sched *s, struct task *t) +static void check_wav_post_select(__a_unused struct sched *s, struct task *t) { - struct check_wav_task_btr *cwt = container_of(t, struct check_wav_task_btr, task); + 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 = btr_get_input_queue_size(cwt->btrn); + size_t sz; + int ret; t->error = 0; - if (cwt->state != CWS_NEED_HEADER) + ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL); + if (ret <= 0) goto out; - if (sz < WAV_HEADER_LEN) { - if (!btr_no_parent(cwt->btrn)) - return; - if (sz != 0) { - cwt->state = CWS_NO_HEADER; - goto out; - } - t->error = -E_WRITE_EOF; - goto err; - } + 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; cwt->channels = 2; cwt->samplerate = 44100; - btr_next_buffer(cwt->btrn, (char **)&a); if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' || a[3] != 'F') { PARA_NOTICE_LOG("wav header not found\n"); cwt->state = CWS_NO_HEADER; @@ -184,82 +120,18 @@ static void check_wav_post_select_btr(__a_unused struct sched *s, struct task *t 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); - btr_consume(cwt->btrn, WAV_HEADER_LEN); + btr_consume(btrn, WAV_HEADER_LEN); +pushdown: + btr_pushdown(btrn); out: - if (sz) - btr_pushdown(cwt->btrn); - else { - if (btr_no_parent(cwt->btrn)) - t->error = -E_WRITE_EOF; - } -err: - if (t->error < 0) - btr_remove_node(cwt->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; - - 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; + t->error = ret; + if (ret < 0) + btr_remove_node(btrn); } 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 *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; - } - if (!conf.writer_given) { - g = setup_default_wng(); - ret = 1; - goto out; - } - g = wng_new(conf.writer_given); - 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) - goto out; - g->writer_nodes[i].writer_num = writer_num; - } - ret = 1; -out: - if (ret > 0) - return g; - free(g); - return NULL; -} - __noreturn static void print_help_and_die(void) { int d = conf.detailed_help_given; @@ -275,13 +147,10 @@ __noreturn static void print_help_and_die(void) exit(0); } -/* - TODO: check wav, initial delay, multiple writers, non-default writers - */ static int main_btr(struct sched *s) { int i, ret; - struct check_wav_task_btr _cwt, *cwt = &_cwt; + struct check_wav_task _cwt, *cwt = &_cwt; struct writer_node *wns; loglevel = get_loglevel_by_name(conf.loglevel_arg); @@ -290,10 +159,11 @@ static int main_btr(struct sched *s) register_task(&sit.task); cwt->state = CWS_NEED_HEADER; + cwt->min_iqs = WAV_HEADER_LEN; cwt->btrn = btr_new_node("check wav", sit.btrn, check_wav_exec, cwt); sprintf(cwt->task.status, "check wav"); - cwt->task.pre_select = check_wav_pre_select_btr; - cwt->task.post_select = check_wav_post_select_btr; + cwt->task.pre_select = check_wav_pre_select; + cwt->task.post_select = check_wav_post_select; cwt->task.error = 0; register_task(&cwt->task); @@ -326,7 +196,6 @@ out: w->close(wn); btr_free_node(wn->btrn); free(wn->conf); - free(wn); } free(wns); btr_free_node(cwt->btrn); @@ -339,8 +208,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 */ @@ -348,8 +217,6 @@ 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); @@ -357,43 +224,7 @@ int main(int argc, char *argv[]) if (conf.help_given || conf.detailed_help_given) print_help_and_die(); - if (conf.buffer_tree_given) { - ret = main_btr(&s); - goto out; - } - wng = check_args(); - if (!wng) - goto out; - stdin_set_defaults(&sit); - 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->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; - - 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);