X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=d48b18e03d729c5617455aa39eb5de91f0ea27ef;hp=5166555272c672ecda4bd4109d2e29b06b90aa4d;hb=f4cc69fd2fad1e51f47be16f552e7a114f43eade;hpb=7e39ff04bb18e5c050e92d5047335c4f09ac9b28 diff --git a/aacdec_filter.c b/aacdec_filter.c index 51665552..d48b18e0 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -23,10 +23,7 @@ #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 /** @@ -65,13 +62,13 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result) if (!strcmp(cmd, "samplerate")) { if (padd->samplerate == 0) - return -ERRNO_TO_PARA_ERROR(ENAVAIL); + return -E_BTR_NAVAIL; *result = make_message("%u", padd->samplerate); return 1; } if (!strcmp(cmd, "channels")) { if (padd->channels == 0) - return -ERRNO_TO_PARA_ERROR(ENAVAIL); + return -E_BTR_NAVAIL; *result = make_message("%u", padd->channels); return 1; } @@ -83,8 +80,6 @@ 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(); } @@ -94,8 +89,6 @@ static void aacdec_close(struct filter_node *fn) struct private_aacdec_data *padd = fn->private_data; NeAACDecClose(padd->handle); - free(fn->buf); - fn->buf = NULL; free(padd); fn->private_data = NULL; }