Introduce btr_node_status() and add btr support to the file writer.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index f968bf142b2af5afc822c69a9c6ea36469f5a9d5..34a04dbce0d30bef8bec35521900c10e2751d6aa 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -43,7 +43,6 @@ struct private_oggdec_data {
        unsigned int channels;
        /** Current sample rate in Hz. */
        unsigned int samplerate;
-       size_t min_iqs;
 };
 
 static size_t cb_read_nobtr(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -160,10 +159,8 @@ static void ogg_close(struct filter_node *fn)
        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);
@@ -184,20 +181,6 @@ static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
        return -ERRNO_TO_PARA_ERROR(ENOTSUP);
 }
 
-static void ogg_pre_select(struct sched *s, struct task *t)
-{
-       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;
-}
-
 static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct filter_node *fn = container_of(t, struct filter_node, task);
@@ -208,11 +191,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
        char *in;
 
        t->error = 0;
-       ret = prepare_filter_node(btrn, pod->min_iqs);
+       ret = btr_node_status(btrn, fn->min_iqs);
        if (ret < 0)
                goto err;
        if (ret == 0)
                return;
+       btr_merge(btrn, fn->min_iqs);
        len = btr_next_buffer(btrn, &in);
        iqs = btr_get_input_queue_size(btrn);
        if (!pod->vf) {
@@ -229,7 +213,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
                        if (!btr_no_parent(btrn)) {
                                free(pod->vf);
                                pod->vf = NULL;
-                               pod->min_iqs = iqs + 1;
+                               fn->min_iqs = iqs + 1;
                                return;
                        }
                        ret = (oret == OV_ENOTVORBIS)?
@@ -391,7 +375,7 @@ void oggdec_filter_init(struct filter *f)
        f->open = ogg_open;
        f->close = ogg_close;
        f->convert = ogg_convert;
-       f->pre_select = ogg_pre_select;
+       f->pre_select = generic_filter_pre_select;
        f->post_select = ogg_post_select;
        f->parse_config = oggdec_parse_config;
        f->execute = oggdec_execute;