/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "string.h"
#include "aac.h"
-/** the output buffer size */
-#define AAC_OUTBUF_SIZE (32 * 1024)
-
-/** give up decoding after that many errors */
+/** Give up decoding after that many errors. */
#define MAX_ERRORS 20
/**
/** The number of channels of the current stream. */
unsigned int channels;
/** Current sample rate in Hz. */
- unsigned int samplerate;
+ unsigned int sample_rate;
};
-#define AACDEC_MAX_PENDING (640 * 1024)
-
-static void aacdec_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) > AACDEC_MAX_PENDING)
- return; /* FIXME, should use reasonable bound on timeout */
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
-}
-
-static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
-{
- struct private_aacdec_data *padd = fn->private_data;
- struct filter_chain *fc = fn->fc;
- int i, ret;
- unsigned char *p, *outbuffer;
- unsigned char *inbuf = (unsigned char*)input_buffer;
- size_t skip, consumed = 0;
-
- if (fn->loaded > fn->bufsize * 3 / 5)
- return 0;
- ret = *fc->input_error;
- if (ret < 0)
- return ret;
- if (len < 2048)
- return 0;
-
- if (!padd->initialized) {
- unsigned long rate = 0;
- unsigned char channels = 0;
- ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
- if (ret < 0) {
- PARA_INFO_LOG("%s\n", para_strerror(-ret));
- ret = NeAACDecInit(padd->handle, inbuf,
- len, &rate, &channels);
- PARA_INFO_LOG("decoder init: %d\n", ret);
- if (ret < 0) {
- ret = -E_AACDEC_INIT;
- goto out;
- }
- consumed = ret;
- } else {
- PARA_INFO_LOG("decoder len: %lu\n",
- padd->decoder_length);
- consumed += skip;
- p = inbuf + consumed;
- ret = -E_AACDEC_INIT;
- if (NeAACDecInit2(padd->handle, p,
- padd->decoder_length, &rate,
- &channels) < 0)
- goto out;
- }
- fc->samplerate = rate;
- fc->channels = channels;
- PARA_INFO_LOG("rate: %u, channels: %d\n",
- fc->samplerate, fc->channels);
- padd->initialized = 1;
- }
- if (padd->decoder_length > 0) {
- consumed = 0;
- if (!padd->entry) {
- ret = aac_find_entry_point(inbuf + consumed,
- len - consumed, &skip);
- if (ret < 0) {
- ret = len;
- goto out;
- }
- consumed += skip;
- padd->entry = ret;
- PARA_INFO_LOG("entry: %zu\n", padd->entry);
- }
- ret = len;
- if (padd->consumed_total + len < padd->entry)
- goto out;
- if (padd->consumed_total < padd->entry)
- consumed = padd->entry - padd->consumed_total;
- }
- for (; consumed < len; consumed++)
- if ((inbuf[consumed] & 0xfe) == 0x20)
- break;
- if (consumed >= len)
- goto success;
- p = inbuf + consumed;
- outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, p,
- len - consumed);
- if (padd->frame_info.error) {
- ret = -E_AAC_DECODE;
- if (padd->error_count++ > MAX_ERRORS)
- goto out;
- PARA_ERROR_LOG("frame_error: %d, consumed: %zu + %zd + %lu\n",
- padd->frame_info.error, padd->consumed_total,
- consumed, padd->frame_info.bytesconsumed);
- PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
- padd->frame_info.error));
- consumed++; /* catch 21 */
- goto success;
- }
- padd->error_count = 0;
- consumed += padd->frame_info.bytesconsumed;
- ret = consumed;
- if (!padd->frame_info.samples)
- goto out;
- ret = -E_AAC_OVERRUN;
- if (padd->frame_info.samples * 2 + fn->loaded > fn->bufsize)
- goto out;
- for (i = 0; i < padd->frame_info.samples; i++) {
- short *s = (short *)outbuffer;
- write_int16_host_endian(fn->buf + fn->loaded, s[i]);
- fn->loaded += 2;
- }
-success:
- ret = consumed;
-out:
- if (ret > 0)
- padd->consumed_total += ret;
- return ret;
-}
-
static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
{
struct filter_node *fn = btr_context(btrn);
struct private_aacdec_data *padd = fn->private_data;
- if (!strcmp(cmd, "samplerate")) {
- if (padd->samplerate == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
- *result = make_message("%u", padd->samplerate);
- return 1;
- }
- if (!strcmp(cmd, "channels")) {
- if (padd->channels == 0)
- return -ERRNO_TO_PARA_ERROR(ENAVAIL);
- *result = make_message("%u", padd->channels);
- return 1;
- }
- return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+ return decoder_execute(cmd, padd->sample_rate, padd->channels, result);
}
static void aacdec_open(struct filter_node *fn)
struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
fn->private_data = padd;
- fn->bufsize = AAC_OUTBUF_SIZE;
- fn->buf = para_calloc(fn->bufsize);
+ fn->min_iqs = 2048;
padd->handle = aac_open();
}
struct private_aacdec_data *padd = fn->private_data;
NeAACDecClose(padd->handle);
- free(fn->buf);
- fn->buf = NULL;
free(padd);
fn->private_data = NULL;
}
int i, ret;
unsigned char *p, *inbuf, *outbuffer;
char *btr_buf;
- size_t len, skip, consumed = 0, loaded, iqs;
+ size_t len, skip, consumed, loaded;
next_buffer:
t->error = 0;
- ret = prepare_filter_node(btrn, 2048);
+ 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 **)&inbuf);
- iqs = btr_get_input_queue_size(btrn);
+ len = PARA_MIN(len, (size_t)8192);
+ consumed = 0;
if (!padd->initialized) {
unsigned long rate = 0;
unsigned char channels = 0;
&channels) < 0)
goto out;
}
- padd->samplerate = rate;
+ padd->sample_rate = rate;
padd->channels = channels;
PARA_INFO_LOG("rate: %u, channels: %d\n",
- padd->samplerate, padd->channels);
+ padd->sample_rate, padd->channels);
padd->initialized = 1;
}
if (padd->decoder_length > 0) {
ret = -E_AAC_DECODE;
if (padd->error_count++ > MAX_ERRORS)
goto err;
- PARA_ERROR_LOG("frame_error: %d (%s), consumed: %zu + %zd + %lu\n",
- err, NeAACDecGetErrorMessage(padd->frame_info.error),
+ /* Suppress non-fatal bitstream error message at BOF/EOF */
+ if (len < fn->min_iqs || padd->consumed_total == 0) {
+ consumed = len;
+ goto success;
+ }
+ PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(err));
+ PARA_ERROR_LOG("consumed: %zu + %zd + %lu\n",
padd->consumed_total, consumed,
padd->frame_info.bytesconsumed);
- PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
- padd->frame_info.error));
- consumed++; /* catch 21 */
+ if (consumed < len)
+ consumed++; /* catch 21 */
goto success;
}
padd->error_count = 0;
}
err:
assert(ret < 0);
- aacdec_close(fn);
t->error = ret;
- btr_del_node(btrn);
+ btr_remove_node(btrn);
}
/**
- * the init function of the aacdec filter
+ * The init function of the aacdec filter.
*
- * \param f pointer to the filter struct to initialize
+ * \param f Pointer to the filter struct to initialize.
*
* \sa filter::init
*/
void aacdec_filter_init(struct filter *f)
{
f->open = aacdec_open;
- f->convert = aacdec;
f->close = aacdec_close;
- f->pre_select = aacdec_pre_select;
- f->post_select = aacdec_post_select;
+ f->pre_select = generic_filter_pre_select;
f->post_select = aacdec_post_select;
f->execute = aacdec_execute;
}
projects / paraslash.git / blobdiff