Merge remote-tracking branch 's/master'

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 042e13b001796821f424547bb73710c827b1ec67..bba71c6ca45d4ab801bd38c5cf29e782135c4a4a 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <vorbis/vorbisfile.h>
-#include <stdbool.h>
 
 #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,24 +93,22 @@ 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;
 }
 
@@ -175,26 +174,31 @@ 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);
 }
 
-#define OGGDEC_MAX_OUTPUT_SIZE (128 * 1024)
-#define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
-
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -204,7 +208,9 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        char *buf;
 
        ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-       if (ret <= 0)
+       if (ret < 0 && ret != -E_BTR_EOF) /* fatal error */
+               goto out;
+       if (ret <= 0 && !pod->have_more) /* nothing to do */
                goto out;
        if (!pod->vf) {
                if (ret <= 0)
@@ -232,6 +238,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
                have = 0;
        }
+       pod->have_more = (ret > 0);
        if (have > 0)
                btr_add_output(buf, have, btrn);
        else