gui: Check only once for invalid key maps.
[paraslash.git] / oggdec_filter.c
index 18ca437..1bc6d2f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
 #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;
+       struct timeval stream_start;
+       unsigned int sample_rate;
 };
 
-static size_t cb_read_nobtr(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)
+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;
@@ -90,16 +63,6 @@ static size_t cb_read_btr(void *buf, size_t size, size_t nmemb, void *datasource
        return tmp;
 }
 
-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);
-}
-
 /*
  * Custom data seeking function.
  *
@@ -132,11 +95,8 @@ 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->min_iqs = 8000;
 }
 
@@ -149,9 +109,7 @@ static void ogg_close(struct filter_node *fn)
                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;
+               PARA_DEBUG_LOG("nothing to close\n");
        free(fn->private_data);
        fn->private_data = NULL;
 }
@@ -163,19 +121,7 @@ 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 int ogg_init(struct filter_node *fn)
@@ -184,7 +130,6 @@ static int ogg_init(struct filter_node *fn)
        struct btr_node *btrn = fn->btrn;
        int ret, oret;
        size_t iqs;
-       struct timeval delay = {0, 500 * 1000};
 
        pod->vf = para_malloc(sizeof(struct OggVorbis_File));
        PARA_NOTICE_LOG("iqs: %zu, min_iqs: %zu, opening ov callbacks\n",
@@ -221,11 +166,10 @@ open:
        if (oret < 0)
                goto out;
        pod->channels = ov_info(pod->vf, 0)->channels;
-       pod->samplerate = ov_info(pod->vf, 0)->rate;
+       pod->sample_rate = ov_info(pod->vf, 0)->rate;
+       tv_add(now, &(struct timeval)EMBRACE(0, 300 * 1000), &pod->stream_start);
        PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
-               pod->samplerate);
-       /* wait a bit to avoid buffer underruns */
-       tv_add(now, &delay, &pod->stream_start);
+               pod->sample_rate);
        ret = 1;
 out:
        if (ret <= 0) {
@@ -239,24 +183,36 @@ out:
        return ret;
 }
 
+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)
+               sched_min_delay(s);
+       else
+               sched_request_barrier(&pod->stream_start, s);
+}
+
 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;
-       size_t iqs, len;
-       int ret;
-       char *in;
+       int ret, ns;
 
+       if (tv_diff(&pod->stream_start, now, NULL) > 0)
+               return;
        pod->converted = 0;
        t->error = 0;
-       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-       if (ret <= 0)
-               goto out;
-       btr_merge(btrn, fn->min_iqs);
-       len = btr_next_buffer(btrn, &in);
-       iqs = btr_get_input_queue_size(btrn);
+       ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
        if (!pod->vf) {
+               if (ret <= 0)
+                       goto out;
+               btr_merge(btrn, fn->min_iqs);
                ret = ogg_init(fn);
                if (ret <= 0)
                        goto out;
@@ -269,21 +225,14 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                pod->converted = 0;
                if (read_ret <= 0)
                        free(out);
-               if (read_ret == 0) {
-                       if (btr_no_parent(btrn))
-                               ret = -E_OGGDEC_EOF;
-                       else
-                               ret = 0;
-                       goto out;
-               }
-               ret = 0;
-               if (read_ret == OV_HOLE)
+               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_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL) == 0)
+               if (btr_get_output_queue_size(btrn) > 128 * 1024)
                        return; /* enough data for the moment */
        }
 out:
@@ -293,36 +242,6 @@ out:
        }
 }
 
-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);
-       return ret;
-}
-
-static void oggdec_free_config(void *conf)
-{
-       oggdec_cmdline_parser_free(conf);
-}
-
 /**
  * The init function of the ogg vorbis decoder.
  *
@@ -330,18 +249,9 @@ static void oggdec_free_config(void *conf)
  */
 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->pre_select = generic_filter_pre_select;
+       f->pre_select = ogg_pre_select;
        f->post_select = ogg_post_select;
-       f->parse_config = oggdec_parse_config;
-       f->free_config = oggdec_free_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
-       };
 }