X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=66cdd7f0c6f15870e5af6752f67b9e395bb749be;hp=508aee790b728b169b4ac5b82832d8385a833f10;hb=68ae99f74f658df5eb53c7ef0127a210e3defd5e;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3 diff --git a/write.c b/write.c index 508aee79..66cdd7f0 100644 --- a/write.c +++ b/write.c @@ -32,8 +32,9 @@ INIT_WRITE_ERRLISTS; struct check_wav_task { char *buf; size_t *loaded; + int *eof; unsigned channels; - unsigned sample_rate; + unsigned samplerate; struct task task; }; @@ -42,7 +43,7 @@ struct initial_delay_task { struct task task; }; -struct gengetopt_args_info conf; +static struct gengetopt_args_info conf; struct stdin_task sit; struct check_wav_task cwt; struct initial_delay_task idt; @@ -53,28 +54,30 @@ static struct writer_node_group *wng; /** * test if audio buffer contains a valid wave header * - * \return If not, return 0, otherwise, store number of channels and sample rate - * in struct conf and return WAV_HEADER_LEN. + * \return If not, return -E_NO_WAV_HEADER, otherwise, return zero. If + * there is less than WAV_HEADER_LEN bytes awailable, return one. */ -static void check_wav_pre_select(struct sched *s, struct task *t) +static void check_wav_pre_select(__a_unused struct sched *s, struct task *t) { struct check_wav_task *cwt = t->private_data; unsigned char *a; if (*cwt->loaded < WAV_HEADER_LEN) { - t->ret = 1; + t->ret = *cwt->eof? -E_PREMATURE_END : 1; 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; cwt->channels = (unsigned) a[22]; - cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24); + 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 = 0; - PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate); + t->ret = -E_WAV_HEADER_SUCCESS; + PARA_INFO_LOG("channels: %d, sample rate: %d\n", cwt->channels, cwt->samplerate); } static void initial_delay_pre_select(struct sched *s, struct task *t) @@ -82,12 +85,11 @@ static void initial_delay_pre_select(struct sched *s, struct task *t) struct initial_delay_task *idt = t->private_data; struct timeval diff; - PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret); t->ret = -E_NO_DELAY; if (!idt->start_time.tv_sec && !idt->start_time.tv_usec) return; - t->ret = 0; /* timeout */ - if (tv_diff(&s->now, &idt->start_time, &diff) > 0) + t->ret = -E_DELAY_TIMEOUT; + if (tv_diff(now, &idt->start_time, &diff) > 0) return; t->ret = 1; if (tv_diff(&s->timeout , &diff, NULL) > 0) @@ -124,8 +126,8 @@ 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.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", @@ -140,11 +142,14 @@ static struct writer_node_group *check_args(void) goto out; } wng = 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; + wng->writer_nodes[i].conf = check_writer_arg( + conf.writer_arg[i], &writer_num); + if (!wng->writer_nodes[i].conf) goto out; - wng->writer_nodes[i].writer = &writers[ret]; + wng->writer_nodes[i].writer = &writers[writer_num]; } ret = 1; out: @@ -154,13 +159,28 @@ out: return NULL; } -static void idt_error_handler(struct task *t) +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) { - PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret); 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)); @@ -168,63 +188,49 @@ static void idt_error_handler(struct task *t) } } -static void cwt_error_handler(struct task *t) +static void cwt_event_handler(struct task *t) { - PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret); - if (t->ret < 0) { + if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) { PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret)); - if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_PRE_EOF) - exit(EXIT_FAILURE); - if (t->ret == -E_PRE_EOF) { - conf.channels_arg = cwt.channels; - conf.sample_rate_arg = cwt.sample_rate; - } + 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.error_handler = idt_error_handler; - idt.task.flags = PRE_EOF_IS_ERROR; + idt.task.event_handler = idt_event_handler; + sprintf(idt.task.status, "initial_delay"); register_task(&idt.task); } -static void stdin_error_handler(struct task *t) -{ - unregister_task(t); - PARA_INFO_LOG("task %p, ret: %d\n", t, t->ret); - if (t->ret < 0) - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret)); - wng->eof = 1; -} - int main(int argc, char *argv[]) { int ret = -E_WRITE_SYNTAX; struct sched s; cmdline_parser(argc, argv, &conf); + init_supported_writers(); + wng = check_args(); if (!wng) goto out; - init_supported_writers(); - init_sched(); - - sit.bufsize = 16 * 1024, - sit.buf = para_malloc(16 * 1024), - sit.loaded = 0, - sit.task.pre_select = stdin_pre_select; - sit.task.post_select = stdin_post_select; - sit.task.error_handler = stdin_error_handler; - sit.task.flags = POST_EOF_IS_ERROR; - sit.task.private_data = &sit; + stdin_set_defaults(&sit); + if (conf.bufsize_given) + sit.bufsize = conf.bufsize_arg; + sit.buf = para_malloc(sit.bufsize), register_task(&sit.task); cwt.task.pre_select = check_wav_pre_select; cwt.task.private_data = &cwt; - cwt.task.error_handler = cwt_error_handler; + cwt.task.event_handler = cwt_event_handler; cwt.buf = sit.buf; cwt.loaded = &sit.loaded; - cwt.task.flags = PRE_EOF_IS_ERROR; + cwt.eof = &sit.eof; + sprintf(cwt.task.status, "check wav"); register_task(&cwt.task); s.default_timeout.tv_sec = 1;