Merge branch 't/oggdec_latency_improvements'

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b405f869ebf4e9af697a87b0fd4a1736e44098ce..cec9c6c3dd15e971fdff1934d668bbcccbe616d1 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -199,7 +199,7 @@ static void ogg_pre_select(struct sched *s, struct task *t)
        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;
@@ -217,7 +217,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        } else if (ret == 0 && !pod->have_more) /* nothing to do */
                goto out;
        if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
-               return;
+               return 0;
        if (!pod->vf) {
                if (ret <= 0)
                        goto out;
@@ -236,13 +236,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                        break;
                fn->min_iqs = 0;
                have += ret;
-               if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
-                       continue;
-               if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+               if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
                        break;
-               btr_add_output(buf, have, btrn);
-               buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-               have = 0;
        }
        pod->have_more = (ret > 0);
        if (have > 0) {
@@ -254,12 +249,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        if (ret == OV_HOLE) /* avoid buffer underruns */
                fn->min_iqs = 9000;
        if (ret >= 0 || ret == OV_HOLE)
-               return;
+               return 0;
        ret = -E_OGGDEC_BADLINK;
 out:
-       t->error = ret;
        if (ret < 0)
                btr_remove_node(&fn->btrn);
+       return ret;
 }
 
 /**