From 05492521d51352fa8c4f55b71b33e14656f0bd0d Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 3 Jan 2010 00:22:56 +0100 Subject: [PATCH 1/1] btr support for the wmadec filter. --- error.h | 1 + wmadec_filter.c | 130 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 118 insertions(+), 13 deletions(-) diff --git a/error.h b/error.h index 0a491690..fd0213b2 100644 --- a/error.h +++ b/error.h @@ -61,6 +61,7 @@ extern const char **para_errlist[]; PARA_ERROR(WMA_BAD_SUPERFRAME, "invalid superframe"), \ PARA_ERROR(WMA_BLOCK_SIZE, "invalid block size"), \ PARA_ERROR(INCOHERENT_BLOCK_LEN, "incoherent block length"), \ + PARA_ERROR(WMADEC_EOF, "wmadec: end of file"), \ #define IMDCT_ERRORS \ diff --git a/wmadec_filter.c b/wmadec_filter.c index 9cc94f4c..4bbc2413 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -1192,6 +1192,120 @@ fail: return ret; } +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; +} + +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 -ERRNO_TO_PARA_ERROR(ENAVAIL); + *result = make_message("%u", pwd->ahi.sample_rate); + return 1; + } + if (!strcmp(cmd, "channels")) { + if (pwd->ahi.channels == 0) + return -ERRNO_TO_PARA_ERROR(ENAVAIL); + *result = make_message("%u", pwd->ahi.channels); + return 1; + } + return -ERRNO_TO_PARA_ERROR(ENOTSUP); +} + +#define WMADEC_MAX_PENDING (640 * 1024) + +static void wmadec_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) > WMADEC_MAX_PENDING) + return; /* FIXME, should use reasonable bound on timeout */ + s->timeout.tv_sec = 0; + s->timeout.tv_usec = 1; +} + +#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 = 0; + struct private_wmadec_data *pwd = fn->private_data; + struct btr_node *btrn = fn->btrn; + size_t iqs, len, min_len; + char *in; + + min_len = pwd? WMA_FRAME_SKIP + pwd->ahi.block_align : 8192; +next_buffer: + t->error = 0; + if (btr_bytes_pending(btrn) > WMADEC_MAX_PENDING) + return; + iqs = btr_get_input_queue_size(btrn); + if (iqs < min_len) { + if (!btr_no_parent(btrn)) /* wait for more data */ + return; + ret = -E_WMADEC_EOF; + goto err; + } + /* avoid "buffer too small" errors from the decoder */ + btr_merge_to(btrn, min_len); + len = btr_next_buffer(btrn, &in); + assert(len >= min_len); + if (!pwd) { + ret = wma_decode_init(in, len, &pwd); + if (ret < 0) + goto err; + if (ret == 0) { + min_len += 4096; + goto next_buffer; + } + fn->private_data = pwd; + converted = pwd->ahi.header_len; + goto success; + } + for (;;) { + char *out; + int out_size = WMA_OUTPUT_BUFFER_SIZE; + if (converted + WMA_FRAME_SKIP + pwd->ahi.block_align > len) + break; + 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) { + free(out); + goto err; + } + btr_add_output(out, out_size, btrn); + converted += ret + WMA_FRAME_SKIP; + } +success: + btr_consume(btrn, converted); + goto next_buffer; +err: + assert(ret < 0); + wmadec_close(fn); + t->error = ret; + btr_del_node(btrn); +} + static ssize_t wmadec_convert(char *inbuffer, size_t len, struct filter_node *fn) { @@ -1227,19 +1341,6 @@ static ssize_t wmadec_convert(char *inbuffer, size_t len, 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; -} - static void wmadec_open(struct filter_node *fn) { fn->bufsize = 1024 * 1024; @@ -1258,4 +1359,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 = wmadec_pre_select; + f->post_select = wmadec_post_select; } -- 2.39.2