Merge branch 't/test_man'
[paraslash.git] / oggdec_filter.c
index 1347244..3222b4a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,10 +8,8 @@
 
 #include <regex.h>
 #include <vorbis/vorbisfile.h>
-#include <stdbool.h>
 
 #include "para.h"
-#include "oggdec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 struct private_oggdec_data {
        /** Describes an ogg vorbis file. */
        OggVorbis_File *vf;
-       /** The input buffer. */
-       char *inbuf;
-       /** The length of \a inbuf. */
-       size_t inbuf_len;
        /** The number of bytes consumed from the input buffer. */
        size_t converted;
-       /** When to start producing output. */
-       struct timeval stream_start;
        /** The number of channels of the current stream. */
        unsigned int channels;
        /** Current sample rate in Hz. */
-       unsigned int samplerate;
+       unsigned int sample_rate;
+       /** Whether everything was decoded during the previous iteration. */
+       bool have_more;
 };
 
-static size_t cb_read_nobtr(void *buf, size_t size, size_t nmemb, void *datasource)
+static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
        struct filter_node *fn = datasource;
        struct private_oggdec_data *pod = fn->private_data;
-       size_t ret, have = pod->inbuf_len - pod->converted;
-       char *p = pod->inbuf + pod->converted;
-
-//     PARA_DEBUG_LOG("pod = %p\n", pod);
-//     PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
-       if (pod->inbuf_len < size) {
-               if (*fn->fc->input_error)
-                       return 0;
-               errno = EAGAIN;
-               return (size_t)-1;
-       }
-       ret = PARA_MIN(nmemb, have / size) * size;
-       memcpy(buf, p, ret);
-       pod->converted += ret;
-       return ret;
-}
-
-static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource)
-{
-       struct filter_node *fn = datasource;
        struct btr_node *btrn = fn->btrn;
-       size_t copied;
+       char *btr_buf;
+       size_t nbytes = btr_next_buffer(btrn, &btr_buf), tmp;
 
        /**
         * oggvorbis always uses size == 1. Other sizes would complicate the code
         * for no real gain. So we simply don't support size != 1.
         */
        assert(size == 1);
-       //PARA_DEBUG_LOG("vorbis requests %zu x %zu = %zu bytes\n", size, nmemb, size * nmemb);
-       copied = 0;
-       for (;;) {
-               char *btr_buf;
-               size_t nbytes = btr_next_buffer(btrn, &btr_buf);
-               if (nbytes == 0)
-                       break;
-               nbytes = PARA_MIN(nmemb - copied, nbytes);
-               memcpy(buf + copied, btr_buf, nbytes);
-               copied += nbytes;
-               btr_consume(btrn, nbytes);
-               if (copied == nmemb)
-                       break;
-       }
-       return copied;
-}
-
-static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
-{
-       struct filter_node *fn = datasource;
-
-       if (fn->btrn)
-               return cb_read_btr(buf, size, nmemb, datasource);
-       else
-               return cb_read_nobtr(buf, size, nmemb, datasource);
+       assert(pod->converted <= nbytes);
+       tmp = nbytes - pod->converted;
+       PARA_DEBUG_LOG("vorbis requests %zu bytes have %zu\n", nmemb, tmp);
+       tmp = PARA_MIN(tmp, nmemb);
+       if (tmp == 0)
+               return 0;
+       memcpy(buf, btr_buf + pod->converted, tmp);
+       pod->converted += tmp;
+       return tmp;
 }
 
 /*
@@ -134,246 +93,166 @@ 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));
-       struct oggdec_filter_args_info *conf = fn->conf;
-
-       fn->private_data = pod;
-       fn->bufsize = conf->bufsize_arg * 1024;
-       fn->buf = para_malloc(fn->bufsize);
+       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 in fc %p, pod = %p\n", pod->vf, pod);
-       free(fn->buf);
-       fn->buf = NULL;
-       free(fn->private_data);
+               PARA_DEBUG_LOG("nothing to close\n");
+       free(pod);
        fn->private_data = NULL;
 }
 
-#define OGGDEC_MAX_PENDING (640 * 1024)
-#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);
        struct private_oggdec_data *pod = fn->private_data;
 
-       if (!strcmp(cmd, "samplerate")) {
-               if (pod->samplerate == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-               *result = make_message("%u", pod->samplerate);
-               return 1;
-       }
-       if (!strcmp(cmd, "channels")) {
-               if (pod->channels == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
-               *result = make_message("%u", pod->channels);
-               return 1;
-       }
-       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+       return decoder_execute(cmd, pod->sample_rate, pod->channels, result);
 }
 
-static void ogg_pre_select(struct sched *s, struct task *t)
+static int ogg_init(struct filter_node *fn)
 {
-       struct filter_node *fn = container_of(t, struct filter_node, task);
-       size_t iqs = btr_get_input_queue_size(fn->btrn);
-
-       t->error = 0;
-       if (iqs == 0)
-               return;
-       if (btr_bytes_pending(fn->btrn) > OGGDEC_MAX_PENDING)
-               return; /* FIXME, should use reasonable bound on timeout */
-       s->timeout.tv_sec = 0;
-       s->timeout.tv_usec = 1;
+       struct private_oggdec_data *pod = fn->private_data;
+       struct btr_node *btrn = fn->btrn;
+       int ret, oret;
+       size_t iqs;
+       struct OggVorbis_File *vf = para_malloc(sizeof(*vf));
+
+       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, vf,
+               NULL, /* no initial buffer */
+               0, /* no initial bytes */
+               ovc); /* the ov_open_callbacks */
+       if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
+               /* 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;
+                       btr_merge(btrn, fn->min_iqs);
+                       pod->converted = 0;
+                       goto open;
+               }
+               ret = (oret == OV_ENOTVORBIS)?
+                       -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
+               goto out;
+       }
+       ret = -E_OGGDEC_READ;
+       if (oret == OV_EREAD)
+               goto out;
+       ret = -E_OGGDEC_VERSION;
+       if (oret == OV_EVERSION)
+               goto out;
+       ret = -E_OGGDEC_FAULT;
+       if (oret < 0)
+               goto out;
+       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(vf);
+       else {
+               btr_consume(btrn, pod->converted);
+               pod->converted = 0;
+               fn->min_iqs = 0;
+               pod->vf = vf;
+               pod->have_more = true;
+       }
+       return ret;
 }
 
-static void ogg_post_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;
-       size_t iqs, len;
        int ret;
-       char *in;
 
-       t->error = 0;
-       ret = prepare_filter_node(fn);
-       if (ret < 0)
-               goto err;
-       if (ret == 0)
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       if (ret != 0)
+               return sched_min_delay(s);
+       if (!pod->have_more)
                return;
-       len = btr_next_buffer(btrn, &in);
-       iqs = btr_get_input_queue_size(btrn);
-       if (!pod->vf) {
-               int oret;
-
-               pod->vf = para_malloc(sizeof(struct OggVorbis_File));
-               PARA_NOTICE_LOG("input queue: %zu, opening ov callbacks\n", iqs);
-               oret = ov_open_callbacks(fn, pod->vf,
-                       NULL, /* no initial buffer */
-                       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 */
-                       if (!btr_no_parent(btrn)) {
-                               free(pod->vf);
-                               pod->vf = NULL;
-                               fn->min_iqs = iqs + 1;
-                               return;
-                       }
-                       ret = (oret == OV_ENOTVORBIS)?
-                               -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
-                       goto err;
-               }
-               ret = -E_OGGDEC_READ;
-               if (oret == OV_EREAD)
-                       goto err;
-               ret = -E_OGGDEC_VERSION;
-               if (oret == OV_EVERSION)
-                       goto err;
-               ret = -E_OGGDEC_FAULT;
-               if (oret < 0)
-                       goto err;
-               pod->channels = ov_info(pod->vf, 0)->channels;
-               pod->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
-                       pod->samplerate);
-               ///* wait a bit to avoid buffer underruns */
-               //tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
+       if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
                return;
-       }
-       for (;;) {
-               char *out = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-               ssize_t read_ret = ov_read(pod->vf, out, OGGDEC_OUTPUT_CHUNK_SIZE,
-                       ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL);
-               if (read_ret <= 0)
-                       free(out);
-               if (read_ret == 0) {
-                       ret = -E_OGGDEC_EOF;
-                       if (btr_no_parent(btrn))
-                               goto err;
-                       return;
-               }
-               if (read_ret == OV_HOLE)
-                       return;
-               if (read_ret < 0) {
-                       ret = -E_OGGDEC_BADLINK;
-                       goto err;
-               }
-               btr_add_output(out, read_ret, btrn);
-       }
-
-err:
-       assert(ret < 0);
-       ogg_close(fn);
-       t->error = ret;
-       btr_del_node(btrn);
+       sched_min_delay(s);
 }
 
-static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
+static int ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
-       ssize_t ret;
+       struct filter_node *fn = container_of(t, struct filter_node, task);
        struct private_oggdec_data *pod = fn->private_data;
-       struct oggdec_filter_args_info *conf = fn->conf;
-       /* make the buffer known to the read callback cb_read() */
-       pod->inbuf = inbuffer;
-       pod->inbuf_len = len;
-       pod->converted = 0;
-
-       if (!pod->vf) {
-               if (*fn->fc->input_error < 0)
-                       return *fn->fc->input_error;
-               if (!len)
-                       return 0;
-               pod->vf = para_malloc(sizeof(struct OggVorbis_File));
-               PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
-               ret = ov_open_callbacks(fn, pod->vf,
-                       NULL, /* no initial buffer */
-                       0, /* no initial bytes */
-                       ovc); /* the ov_open_callbacks */
-               if (ret == OV_ENOTVORBIS || ret == OV_EBADHEADER) {
-                       /* this might be due to the input buffer being too small */
-                       int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
-                       if (len < ib) {
-                               PARA_INFO_LOG("initial input buffer %zd/%d, "
-                                       "waiting for more data\n", len, ib);
-                               free(pod->vf);
-                               pod->vf = NULL;
-                               return 0;
-                       }
-                       return ret == OV_ENOTVORBIS?
-                               -E_OGGDEC_NOTVORBIS : -E_OGGDEC_BADHEADER;
-               }
-               if (ret == OV_EREAD)
-                       return -E_OGGDEC_READ;
-               if (ret == OV_EVERSION)
-                       return -E_OGGDEC_VERSION;
-               if (ret < 0)
-                       return -E_OGGDEC_FAULT;
-               fn->fc->channels = ov_info(pod->vf, 0)->channels;
-               fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
-                       fn->fc->samplerate);
-               /* wait a bit to avoid buffer underruns */
-               tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
-               return pod->converted;
-       }
-       if (tv_diff(now, &pod->stream_start, NULL) < 0) {
-               PARA_DEBUG_LOG("initial delay..\n");
+       struct btr_node *btrn = fn->btrn;
+       int ret, have;
+       char *buf;
+
+       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);
+               goto out;
        }
-       while (fn->loaded < fn->bufsize) {
-               int length = fn->bufsize - fn->loaded;
-               long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
+       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);
-               if (read_ret == 0)
-                       return pod->converted;
-               if (read_ret == OV_HOLE) {
-                       if (!fn->loaded) {
-                               PARA_INFO_LOG("hole, delaying playback\n");
-                               tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start);
-                       }
-                       return pod->converted;
-               }
-               if (read_ret < 0)
-                       return -E_OGGDEC_BADLINK;
-               fn->loaded += read_ret;
+               btr_consume(btrn, pod->converted);
+               pod->converted = 0;
+               if (ret <= 0)
+                       break;
+               fn->min_iqs = 0;
+               have += ret;
+               if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
+                       break;
        }
-       return pod->converted;
-}
-
-static int oggdec_parse_config(int argc, char **argv, void **config)
-{
-       int ret;
-       struct oggdec_filter_args_info *ogg_conf;
-
-       ogg_conf = para_calloc(sizeof(*ogg_conf));
-       ret = -E_OGGDEC_SYNTAX;
-       if (oggdec_cmdline_parser(argc, argv, ogg_conf))
-               goto err;
-       ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-       if (ogg_conf->bufsize_arg < 0)
-               goto err;
-       if (ogg_conf->bufsize_arg >= INT_MAX / 1024)
-               goto err;
-       if (ogg_conf->initial_buffer_arg < 0)
-               goto err;
-       if (ogg_conf->initial_buffer_arg >= INT_MAX / 1024)
-               goto err;
-       *config = ogg_conf;
-       return 1;
-err:
-       free(ogg_conf);
+       pod->have_more = (ret > 0);
+       if (have > 0) {
+               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 (ret >= 0 || ret == OV_HOLE)
+               return 0;
+       ret = -E_OGGDEC_BADLINK;
+out:
+       if (ret < 0)
+               btr_remove_node(&fn->btrn);
        return ret;
 }
 
@@ -384,18 +263,9 @@ err:
  */
 void oggdec_filter_init(struct filter *f)
 {
-       struct oggdec_filter_args_info dummy;
-
-       oggdec_cmdline_parser_init(&dummy);
        f->open = ogg_open;
        f->close = ogg_close;
-       f->convert = ogg_convert;
        f->pre_select = ogg_pre_select;
        f->post_select = ogg_post_select;
-       f->parse_config = oggdec_parse_config;
        f->execute = oggdec_execute;
-       f->help = (struct ggo_help) {
-               .short_help = oggdec_filter_args_info_help,
-               .detailed_help = oggdec_filter_args_info_detailed_help
-       };
 }