X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=3222b4aaaaabc046ac3983359ae58d868861c46a;hp=f14d97c13dec8c2c3fe6660aadb5d7b6d3d2c328;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8 diff --git a/oggdec_filter.c b/oggdec_filter.c index f14d97c1..3222b4aa 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,10 +8,8 @@ #include #include -#include #include "para.h" -#include "oggdec_filter.cmdline.h" #include "list.h" #include "sched.h" #include "ggo.h" @@ -33,12 +31,12 @@ struct private_oggdec_data { OggVorbis_File *vf; /** The number of bytes consumed from the input buffer. */ size_t converted; - /** When to start producing output. */ - struct timeval stream_start; /** The number of channels of the current stream. */ unsigned int channels; /** Current sample rate in Hz. */ - unsigned int samplerate; + unsigned int sample_rate; + /** Whether everything was decoded during the previous iteration. */ + bool have_more; }; static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) @@ -95,47 +93,31 @@ static const ov_callbacks ovc = { static void ogg_open(struct filter_node *fn) { - struct private_oggdec_data *pod = para_calloc( - sizeof(struct private_oggdec_data)); - - fn->private_data = pod; + fn->private_data = para_calloc(sizeof(struct private_oggdec_data)); fn->min_iqs = 8000; } static void ogg_close(struct filter_node *fn) { struct private_oggdec_data *pod = fn->private_data; - if (pod->vf) { + + if (pod && pod->vf) { PARA_DEBUG_LOG("ov_clearing %p, pod = %p\n", pod->vf, pod); ov_clear(pod->vf); free(pod->vf); pod->vf = NULL; } else PARA_DEBUG_LOG("nothing to close\n"); - free(fn->private_data); + free(pod); fn->private_data = NULL; } -#define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024) - static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result) { struct filter_node *fn = btr_context(btrn); struct private_oggdec_data *pod = fn->private_data; - if (!strcmp(cmd, "samplerate")) { - if (pod->samplerate == 0) - return -E_BTR_NAVAIL; - *result = make_message("%u", pod->samplerate); - return 1; - } - if (!strcmp(cmd, "channels")) { - if (pod->channels == 0) - return -E_BTR_NAVAIL; - *result = make_message("%u", pod->channels); - return 1; - } - return -ERRNO_TO_PARA_ERROR(ENOTSUP); + return decoder_execute(cmd, pod->sample_rate, pod->channels, result); } static int ogg_init(struct filter_node *fn) @@ -144,25 +126,23 @@ static int ogg_init(struct filter_node *fn) struct btr_node *btrn = fn->btrn; int ret, oret; size_t iqs; - struct timeval delay = {0, 500 * 1000}; + struct OggVorbis_File *vf = para_malloc(sizeof(*vf)); - pod->vf = para_malloc(sizeof(struct OggVorbis_File)); PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n", btr_get_input_queue_size(btrn), fn->min_iqs); open: - oret = ov_open_callbacks(fn, pod->vf, + oret = ov_open_callbacks(fn, vf, NULL, /* no initial buffer */ 0, /* no initial bytes */ ovc); /* the ov_open_callbacks */ if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) { - /* this might be due to the input buffer being too small */ + /* maybe the input buffer is too small */ if (!btr_no_parent(btrn)) { fn->min_iqs += 1000; iqs = btr_get_input_queue_size(btrn); ret = 0; if (iqs < fn->min_iqs) goto out; - PARA_CRIT_LOG("iqs: %zu\n", iqs); btr_merge(btrn, fn->min_iqs); pod->converted = 0; goto open; @@ -180,109 +160,102 @@ open: ret = -E_OGGDEC_FAULT; if (oret < 0) goto out; - pod->channels = ov_info(pod->vf, 0)->channels; - pod->samplerate = ov_info(pod->vf, 0)->rate; + pod->channels = ov_info(vf, 0)->channels; + pod->sample_rate = ov_info(vf, 0)->rate; PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels, - pod->samplerate); - /* wait a bit to avoid buffer underruns */ - tv_add(now, &delay, &pod->stream_start); + pod->sample_rate); ret = 1; out: - if (ret <= 0) { - free(pod->vf); - pod->vf = NULL; - } else { + if (ret <= 0) + free(vf); + else { btr_consume(btrn, pod->converted); pod->converted = 0; fn->min_iqs = 0; + pod->vf = vf; + pod->have_more = true; } return ret; } -static void ogg_post_select(__a_unused struct sched *s, struct task *t) +#define OGGDEC_MAX_OUTPUT_SIZE (96 * 1024) +#define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024) + +static void ogg_pre_select(struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); struct private_oggdec_data *pod = fn->private_data; struct btr_node *btrn = fn->btrn; - size_t iqs, len; int ret; - char *in; - pod->converted = 0; - t->error = 0; ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); - if (ret <= 0) + if (ret != 0) + return sched_min_delay(s); + if (!pod->have_more) + return; + if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) + return; + sched_min_delay(s); +} + +static int ogg_post_select(__a_unused struct sched *s, struct task *t) +{ + struct filter_node *fn = container_of(t, struct filter_node, task); + struct private_oggdec_data *pod = fn->private_data; + struct btr_node *btrn = fn->btrn; + int ret, have; + char *buf; + + ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); + if (ret < 0) { + if (ret != -E_BTR_EOF) /* fatal error */ + goto out; + if (fn->min_iqs == 0 && !pod->have_more) /* EOF */ + goto out; + /* last ov_read() returned OV_HOLE */ + } else if (ret == 0 && !pod->have_more) /* nothing to do */ goto out; - btr_merge(btrn, fn->min_iqs); - len = btr_next_buffer(btrn, &in); - iqs = btr_get_input_queue_size(btrn); + if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) + return 0; if (!pod->vf) { - ret = ogg_init(fn); if (ret <= 0) goto out; + btr_merge(btrn, fn->min_iqs); + ret = ogg_init(fn); + goto out; } + have = 0; + buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE); for (;;) { - char *out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE); - ssize_t read_ret = ov_read(pod->vf, out, OGGDEC_OUTPUT_CHUNK_SIZE, + ret = ov_read(pod->vf, buf + have, OGGDEC_OUTPUT_CHUNK_SIZE - have, ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL); btr_consume(btrn, pod->converted); pod->converted = 0; - if (read_ret <= 0) - free(out); - if (read_ret == 0) { - if (btr_no_parent(btrn)) - ret = -E_OGGDEC_EOF; - else - ret = 0; - goto out; - } - ret = 0; - if (read_ret == OV_HOLE) - goto out; - ret = -E_OGGDEC_BADLINK; - if (read_ret < 0) - goto out; - btr_add_output(out, read_ret, btrn); - if (btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL) == 0) - return; /* enough data for the moment */ + if (ret <= 0) + break; + fn->min_iqs = 0; + have += ret; + if (have >= OGGDEC_OUTPUT_CHUNK_SIZE) + break; } + pod->have_more = (ret > 0); + if (have > 0) { + if (have < OGGDEC_OUTPUT_CHUNK_SIZE) + buf = para_realloc(buf, have); + btr_add_output(buf, have, btrn); + } else + free(buf); + if (ret == OV_HOLE) /* avoid buffer underruns */ + fn->min_iqs = 9000; + if (ret >= 0 || ret == OV_HOLE) + return 0; + ret = -E_OGGDEC_BADLINK; out: - if (ret < 0) { - t->error = ret; - btr_remove_node(btrn); - } -} - -static int oggdec_parse_config(int argc, char **argv, void **config) -{ - int ret; - struct oggdec_filter_args_info *ogg_conf; - - ogg_conf = para_calloc(sizeof(*ogg_conf)); - ret = -E_OGGDEC_SYNTAX; - if (oggdec_cmdline_parser(argc, argv, ogg_conf)) - goto err; - ret = -ERRNO_TO_PARA_ERROR(EINVAL); - if (ogg_conf->bufsize_arg < 0) - goto err; - if (ogg_conf->bufsize_arg >= INT_MAX / 1024) - goto err; - if (ogg_conf->initial_buffer_arg < 0) - goto err; - if (ogg_conf->initial_buffer_arg >= INT_MAX / 1024) - goto err; - *config = ogg_conf; - return 1; -err: - free(ogg_conf); + if (ret < 0) + btr_remove_node(&fn->btrn); return ret; } -static void oggdec_free_config(void *conf) -{ - oggdec_cmdline_parser_free(conf); -} - /** * The init function of the ogg vorbis decoder. * @@ -290,18 +263,9 @@ static void oggdec_free_config(void *conf) */ void oggdec_filter_init(struct filter *f) { - struct oggdec_filter_args_info dummy; - - oggdec_cmdline_parser_init(&dummy); f->open = ogg_open; f->close = ogg_close; - f->pre_select = generic_filter_pre_select; + f->pre_select = ogg_pre_select; f->post_select = ogg_post_select; - f->parse_config = oggdec_parse_config; - f->free_config = oggdec_free_config; f->execute = oggdec_execute; - f->help = (struct ggo_help) { - .short_help = oggdec_filter_args_info_help, - .detailed_help = oggdec_filter_args_info_detailed_help - }; }