X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec.c;h=c7bec16479ae1373f05cfa0118da8af36eee0c72;hp=2433b181ef8d7b3730f3e7dd10c1169c55fdc8ce;hb=ede4d4615c5a0e41a1dffc83ad78e9aabe1d57a3;hpb=e19276003c9158fceccae4d7e626cabb2fb5b0dd

diff --git a/aacdec.c b/aacdec.c
index 2433b181..c7bec164 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -21,7 +21,7 @@
  * Ahead Software AG
  */
 
-/** \file aacdec.c paraslash's mp3 decoder */
+/** \file aacdec.c paraslash's aac (m4a) decoder */
 
 #include "para.h"
 
@@ -31,8 +31,8 @@
 #include "string.h"
 #include "aac.h"
 
-/** the output buffer size */
 #define MAX_CHANNELS 6
+/** the output buffer size */
 #define AAC_OUTBUF_SIZE (FAAD_MIN_STREAMSIZE * MAX_CHANNELS)
 
 /**
@@ -40,23 +40,20 @@
  *
  * \sa filter, filter_node
  */
-struct private_mp4dec_data {
-	NeAACDecHandle decoder;
+struct private_aacdec_data {
+	NeAACDecHandle handle;
 	NeAACDecFrameInfo frame_info;
 
 	int initialized;
 	int decoder_length;
 	long unsigned consumed_total;
-
 	long unsigned entry;
 };
 
-static ssize_t mp4dec(char *input_buffer, size_t len, struct filter_node *fn)
+static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 {
-	struct private_mp4dec_data *padd = fn->private_data;
+	struct private_aacdec_data *padd = fn->private_data;
 	struct filter_chain_info *fci = fn->fci;
-	unsigned long rate = 0;
-	unsigned char channels = 0;
 	int i, ret, skip;
 	unsigned char *p, *outbuffer;
 	unsigned char *inbuf = (unsigned char*)input_buffer;
@@ -68,10 +65,12 @@ static ssize_t mp4dec(char *input_buffer, size_t len, struct filter_node *fn)
 		return 0;
 
 	if (!padd->initialized) {
+		unsigned long rate = 0;
+		unsigned char channels = 0;
 		padd->decoder_length = aac_find_esds(inbuf, len, &skip);
 		PARA_INFO_LOG("decoder len: %d\n", padd->decoder_length);
 		if (padd->decoder_length < 0) {
-			ret = NeAACDecInit(padd->decoder, inbuf,
+			ret = NeAACDecInit(padd->handle, inbuf,
 				len, &rate, &channels);
 			PARA_INFO_LOG("decoder init: %d\n", ret);
 			if (ret < 0) {
@@ -83,7 +82,7 @@ static ssize_t mp4dec(char *input_buffer, size_t len, struct filter_node *fn)
 			consumed += skip;
 			p = inbuf + consumed;
 			ret = -E_AACDEC_INIT;
-			if (NeAACDecInit2(padd->decoder, p,
+			if (NeAACDecInit2(padd->handle, p,
 					padd->decoder_length, &rate,
 					&channels) < 0)
 				goto out;
@@ -119,7 +118,7 @@ static ssize_t mp4dec(char *input_buffer, size_t len, struct filter_node *fn)
 	if (consumed >= len)
 		goto success;
 	p = inbuf + consumed;
-	outbuffer = NeAACDecDecode(padd->decoder, &padd->frame_info, p,
+	outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, p,
 		len - consumed);
 	ret = -E_AAC_DECODE;
 	if (padd->frame_info.error != 0) {
@@ -148,21 +147,21 @@ out:
 	return ret;
 }
 
-static void mp4dec_open(struct filter_node *fn)
+static void aacdec_open(struct filter_node *fn)
 {
-	fn->private_data = para_calloc(sizeof(struct private_mp4dec_data));
-	struct private_mp4dec_data *padd = fn->private_data;
+	fn->private_data = para_calloc(sizeof(struct private_aacdec_data));
+	struct private_aacdec_data *padd = fn->private_data;
 
 	fn->bufsize = AAC_OUTBUF_SIZE;
 	fn->buf = para_calloc(fn->bufsize);
-	padd->decoder = aac_open();
+	padd->handle = aac_open();
 }
 
-static void mp4dec_close(struct filter_node *fn)
+static void aacdec_close(struct filter_node *fn)
 {
-	struct private_mp4dec_data *padd = fn->private_data;
+	struct private_aacdec_data *padd = fn->private_data;
 
-	NeAACDecClose(padd->decoder);
+	NeAACDecClose(padd->handle);
 	free(fn->buf);
 	fn->buf = NULL;
 	free(padd);
@@ -170,13 +169,13 @@ static void mp4dec_close(struct filter_node *fn)
 }
 
 /**
- * the init function of the mp3dec filter
+ * the init function of the aacdec filter
  *
  * \sa filter::init
  */
 void aacdec_init(struct filter *f)
 {
-	f->open = mp4dec_open;
-	f->convert = mp4dec;
-	f->close = mp4dec_close;
+	f->open = aacdec_open;
+	f->convert = aacdec;
+	f->close = aacdec_close;
 }