para_write: Return proper error code.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 1bc6d2f748e8cbe7c3067e3479e91ef771fb7667..44d299feaf5c67c4a4c78e192e61a4267881e568 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -35,7 +35,6 @@ struct private_oggdec_data {
        /** The number of channels of the current stream. */
        unsigned int channels;
        /** Current sample rate in Hz. */
-       struct timeval stream_start;
        unsigned int sample_rate;
 };
 
@@ -114,7 +113,7 @@ static void ogg_close(struct filter_node *fn)
        fn->private_data = NULL;
 }
 
-#define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024)
+#define OGGDEC_OUTPUT_CHUNK_SIZE (640 * 1024)
 
 static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
@@ -130,12 +129,12 @@ static int ogg_init(struct filter_node *fn)
        struct btr_node *btrn = fn->btrn;
        int ret, oret;
        size_t iqs;
+       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 */
@@ -165,20 +164,19 @@ open:
        ret = -E_OGGDEC_FAULT;
        if (oret < 0)
                goto out;
-       pod->channels = ov_info(pod->vf, 0)->channels;
-       pod->sample_rate = ov_info(pod->vf, 0)->rate;
-       tv_add(now, &(struct timeval)EMBRACE(0, 300 * 1000), &pod->stream_start);
+       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->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;
        }
        return ret;
 }
@@ -186,15 +184,14 @@ out:
 static void ogg_pre_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;
        int ret;
 
        t->error = 0;
        ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
-       if (ret < 0)
+       if (ret != 0)
                sched_min_delay(s);
        else
-               sched_request_barrier(&pod->stream_start, s);
+               sched_request_timeout_ms(100, s);
 }
 
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
@@ -203,12 +200,14 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        struct private_oggdec_data *pod = fn->private_data;
        struct btr_node *btrn = fn->btrn;
        int ret, ns;
+       char *out;
+       ssize_t read_ret, have;
 
-       if (tv_diff(&pod->stream_start, now, NULL) > 0)
-               return;
        pod->converted = 0;
        t->error = 0;
        ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       if (ret <= 0)
+               goto out;
        if (!pod->vf) {
                if (ret <= 0)
                        goto out;
@@ -217,24 +216,36 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                if (ret <= 0)
                        goto out;
        }
-       for (;;) {
-               char *out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-               ssize_t read_ret = ov_read(pod->vf, out, OGGDEC_OUTPUT_CHUNK_SIZE,
+       out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
+       for (have = 0;;) {
+               read_ret = ov_read(pod->vf, out + 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 == 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 (btr_get_output_queue_size(btrn) > 128 * 1024)
-                       return; /* enough data for the moment */
+                       break;
+               have += read_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);
+       if (have > 0) {
+               btr_add_output(out, have, btrn);
+               fn->min_iqs = 0;
        }
+       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;
+       ret = 0;
 out:
        if (ret < 0) {
                t->error = ret;