Simplify ogg_post_select().

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 94c284a7039c193d45927fa970498a9408a59698..042e13b001796821f424547bb73710c827b1ec67 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -113,8 +113,6 @@ static void ogg_close(struct filter_node *fn)
        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);
@@ -194,16 +192,18 @@ static void ogg_pre_select(__a_unused struct sched *s, struct task *t)
                sched_request_timeout_ms(100, 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);
        struct private_oggdec_data *pod = fn->private_data;
        struct btr_node *btrn = fn->btrn;
-       int ret, ns;
+       int ret, have;
+       char *buf;
 
-       pod->converted = 0;
-       t->error = 0;
-       ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (ret <= 0)
                goto out;
        if (!pod->vf) {
@@ -211,35 +211,40 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                        goto out;
                btr_merge(btrn, fn->min_iqs);
                ret = ogg_init(fn);
-               if (ret <= 0)
-                       goto out;
+               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);
-               ret = ns;
-               if (read_ret == OV_HOLE) /* avoid buffer underruns */
-                       fn->min_iqs = 9000;
-               if (read_ret == 0 || read_ret == OV_HOLE)
-                       goto out;
-               ret = -E_OGGDEC_BADLINK;
-               if (read_ret < 0)
-                       goto out;
-               btr_add_output(out, read_ret, btrn);
+               if (ret <= 0)
+                       break;
                fn->min_iqs = 0;
-               if (btr_get_output_queue_size(btrn) > 128 * 1024)
-                       return; /* enough data for the moment */
+               have += ret;
+               if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
+                       continue;
+               if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+                       break;
+               btr_add_output(buf, have, btrn);
+               buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+               have = 0;
        }
+       if (have > 0)
+               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;
+       ret = -E_OGGDEC_BADLINK;
 out:
-       if (ret < 0) {
-               t->error = ret;
+       t->error = ret;
+       if (ret < 0)
                btr_remove_node(btrn);
-       }
 }
 
 /**