X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=3222b4aaaaabc046ac3983359ae58d868861c46a;hp=44d299feaf5c67c4a4c78e192e61a4267881e568;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=f44d27b634fe4a26efc38de75e8b84524d156c4b diff --git a/oggdec_filter.c b/oggdec_filter.c index 44d299fe..3222b4aa 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "list.h" @@ -36,6 +35,8 @@ struct private_oggdec_data { unsigned int channels; /** Current sample rate in Hz. */ 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) @@ -92,29 +93,25 @@ 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 (640 * 1024) - static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result) { struct filter_node *fn = btr_context(btrn); @@ -139,14 +136,13 @@ open: 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; @@ -177,80 +173,87 @@ out: pod->converted = 0; fn->min_iqs = 0; pod->vf = vf; + pod->have_more = true; } return ret; } -static void ogg_pre_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; int ret; - t->error = 0; - ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL); + ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); if (ret != 0) - sched_min_delay(s); - else - sched_request_timeout_ms(100, s); + 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 void ogg_post_select(__a_unused struct sched *s, struct task *t) +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, ns; - char *out; - ssize_t read_ret, have; + int ret, have; + char *buf; - pod->converted = 0; - t->error = 0; - ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); - if (ret <= 0) + 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; + if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) + return 0; if (!pod->vf) { if (ret <= 0) goto out; btr_merge(btrn, fn->min_iqs); ret = ogg_init(fn); - if (ret <= 0) - goto out; + goto out; } - out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE); - for (have = 0;;) { - read_ret = ov_read(pod->vf, out + have, - OGGDEC_OUTPUT_CHUNK_SIZE - have, + have = 0; + buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE); + for (;;) { + 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) + if (ret <= 0) break; - have += read_ret; + fn->min_iqs = 0; + have += ret; if (have >= OGGDEC_OUTPUT_CHUNK_SIZE) break; } - if (have == 0) - free(out); - else if (have < OGGDEC_OUTPUT_CHUNK_SIZE) - out = para_realloc(out, have); + pod->have_more = (ret > 0); if (have > 0) { - btr_add_output(out, have, btrn); - fn->min_iqs = 0; - } - ret = ns; - if (read_ret == OV_HOLE) /* avoid buffer underruns */ + 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 (read_ret == 0 || read_ret == OV_HOLE) - goto out; + if (ret >= 0 || ret == OV_HOLE) + return 0; ret = -E_OGGDEC_BADLINK; - if (read_ret < 0) - goto out; - ret = 0; out: - if (ret < 0) { - t->error = ret; - btr_remove_node(btrn); - } + if (ret < 0) + btr_remove_node(&fn->btrn); + return ret; } /**