08_refactor-makesock.diff

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 061642aeaa7db199525e87fcda9059c1f939932c..96fb50082d2bff52ba082904341851048c66c6ef 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <regex.h>
 #include <sys/select.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -32,6 +33,7 @@
 #include "ggo.h"
 #include "string.h"
 #include "sched.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "bitstream.h"
 #include "imdct.h"
@@ -148,7 +150,7 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
-#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16)
+#define SINE_WINDOW(x) float sine_ ## x[x] __a_aligned(16)
 
 SINE_WINDOW(128);
 SINE_WINDOW(256);
@@ -1179,9 +1181,9 @@ static int wma_decode_superframe(struct private_wmadec_data *pwd, void *data,
                        goto fail;
                samples += pwd->ahi.channels * pwd->frame_len;
        }
-       PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %zd, eaten: %d\n",
+       PARA_DEBUG_LOG("frame_len: %d, block_len: %d, outbytes: %d, eaten: %d\n",
                pwd->frame_len, pwd->block_len,
-               (int8_t *) samples - (int8_t *) data, pwd->ahi.block_align);
+               (int)((int8_t *)samples - (int8_t *)data), pwd->ahi.block_align);
        *data_size = (int8_t *)samples - (int8_t *)data;
        return pwd->ahi.block_align;
 fail:
@@ -1190,60 +1192,104 @@ fail:
        return ret;
 }
 
-static ssize_t wmadec_convert(char *inbuffer, size_t len,
-               struct filter_node *fn)
+static void wmadec_close(struct filter_node *fn)
 {
-       int ret, converted = 0;
        struct private_wmadec_data *pwd = fn->private_data;
 
-       if (len <= WMA_FRAME_SKIP)
-               return 0;
+       if (!pwd)
+               return;
+       wmadec_cleanup(pwd);
+       free(fn->private_data);
+       fn->private_data = NULL;
+}
+
+static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
+{
+       struct filter_node *fn = btr_context(btrn);
+       struct private_wmadec_data *pwd = fn->private_data;
+
+       if (!strcmp(cmd, "samplerate")) {
+               if (pwd->ahi.sample_rate == 0)
+                       return -E_BTR_NAVAIL;
+               *result = make_message("%u", pwd->ahi.sample_rate);
+               return 1;
+       }
+       if (!strcmp(cmd, "channels")) {
+               if (pwd->ahi.channels == 0)
+                       return -E_BTR_NAVAIL;
+               *result = make_message("%u", pwd->ahi.channels);
+               return 1;
+       }
+       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+}
+
+#define WMA_OUTPUT_BUFFER_SIZE (128 * 1024)
+
+static void wmadec_post_select(__a_unused struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       int ret, converted;
+       struct private_wmadec_data *pwd = fn->private_data;
+       struct btr_node *btrn = fn->btrn;
+       size_t len;
+       char *in;
+
+next_buffer:
+       converted = 0;
+       t->error = 0;
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
+               return;
+       btr_merge(btrn, fn->min_iqs);
+       len = btr_next_buffer(btrn, (char **)&in);
+       ret = -E_WMADEC_EOF;
+       if (len < fn->min_iqs)
+               goto err;
        if (!pwd) {
-               ret = wma_decode_init(inbuffer, len, &pwd);
-               if (ret <= 0)
-                       return ret;
+               ret = wma_decode_init(in, len, &pwd);
+               if (ret < 0)
+                       goto err;
+               if (ret == 0) {
+                       fn->min_iqs += 4096;
+                       goto next_buffer;
+               }
+               fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
                fn->private_data = pwd;
-               fn->fc->channels = pwd->ahi.channels;
-               fn->fc->samplerate = pwd->ahi.sample_rate;
-               return pwd->ahi.header_len;
+               converted = pwd->ahi.header_len;
+               goto success;
        }
+       fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
        for (;;) {
-               int out_size;
-               if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len)
+               char *out;
+               int out_size = WMA_OUTPUT_BUFFER_SIZE;
+               if (converted + fn->min_iqs > len)
                        break;
-               out_size = fn->bufsize - fn->loaded;
-               if (out_size < 128 * 1024)
-                       break;
-               ret = wma_decode_superframe(pwd, fn->buf + fn->loaded,
-                       &out_size, (uint8_t *)inbuffer + converted + WMA_FRAME_SKIP,
+               out = para_malloc(WMA_OUTPUT_BUFFER_SIZE);
+               ret = wma_decode_superframe(pwd, out,
+                       &out_size, (uint8_t *)in + converted + WMA_FRAME_SKIP,
                        len - WMA_FRAME_SKIP);
-               if (ret < 0)
-                       return ret;
-               fn->loaded += out_size;
+               if (ret < 0) {
+                       free(out);
+                       goto err;
+               }
+               btr_add_output(out, out_size, btrn);
                converted += ret + WMA_FRAME_SKIP;
        }
-       return converted;
-}
-
-static void wmadec_close(struct filter_node *fn)
-{
-       struct private_wmadec_data *pwd = fn->private_data;
-
-       if (!pwd)
-               return;
-       wmadec_cleanup(pwd);
-       free(fn->buf);
-       fn->buf = NULL;
-       free(fn->private_data);
-       fn->private_data = NULL;
+success:
+       btr_consume(btrn, converted);
+       goto next_buffer;
+err:
+       assert(ret < 0);
+       t->error = ret;
+       btr_remove_node(btrn);
 }
 
 static void wmadec_open(struct filter_node *fn)
 {
-       fn->bufsize = 1024 * 1024;
-       fn->buf = para_malloc(fn->bufsize);
        fn->private_data = NULL;
-       fn->loaded = 0;
+       fn->min_iqs = 4096;
 }
 
 /**
@@ -1255,5 +1301,7 @@ void wmadec_filter_init(struct filter *f)
 {
        f->open = wmadec_open;
        f->close = wmadec_close;
-       f->convert = wmadec_convert;
+       f->execute = wmadec_execute;
+       f->pre_select = generic_filter_pre_select;
+       f->post_select = wmadec_post_select;
 }