X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec.c;h=ce9c50da84efcd47b2c325743f5d1feb58d9b376;hp=c20761c6f451c8d0ac93730e0258678c3ea37a7c;hb=bfbc3f075056b468dfdb525d8a623fe50a20117a;hpb=88aacb1ef41e360b051e069035e5be6a8561eab2

diff --git a/aacdec.c b/aacdec.c
index c20761c6..ce9c50da 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -15,13 +15,12 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
-
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG
  */
 
-/** \file aacdec.c paraslash's mp3 decoder */
+/** \file aacdec.c paraslash's aac (m4a) decoder */
 
 #include "para.h"
 
@@ -31,8 +30,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)
 
 /**
@@ -41,13 +40,12 @@
  * \sa filter, filter_node
  */
 struct private_aacdec_data {
-	NeAACDecHandle decoder;
+	NeAACDecHandle handle;
 	NeAACDecFrameInfo frame_info;
 
 	int initialized;
 	int decoder_length;
 	long unsigned consumed_total;
-
 	long unsigned entry;
 };
 
@@ -55,8 +53,6 @@ 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_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 +64,12 @@ static ssize_t aacdec(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 +81,7 @@ static ssize_t aacdec(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;
@@ -97,14 +95,14 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 	if (padd->decoder_length > 0) {
 		consumed = 0;
 		if (!padd->entry) {
-			ret = aac_find_stco(inbuf + consumed, len - consumed,
-				&skip);
+			ret = aac_find_entry_point(inbuf + consumed,
+				len - consumed, &skip);
 			if (ret < 0) {
 				ret = len;
 				goto out;
 			}
 			consumed += skip;
-			padd->entry = aac_read_int32(inbuf + consumed);
+			padd->entry = ret;
 			PARA_INFO_LOG("entry: %lu\n", padd->entry);
 		}
 		ret = len;
@@ -119,7 +117,7 @@ static ssize_t aacdec(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) {
@@ -155,14 +153,14 @@ static void aacdec_open(struct filter_node *fn)
 
 	fn->bufsize = AAC_OUTBUF_SIZE;
 	fn->buf = para_calloc(fn->bufsize);
-	padd->decoder = aac_open();
+	padd->handle = aac_open();
 }
 
 static void aacdec_close(struct filter_node *fn)
 {
 	struct private_aacdec_data *padd = fn->private_data;
 
-	NeAACDecClose(padd->decoder);
+	NeAACDecClose(padd->handle);
 	free(fn->buf);
 	fn->buf = NULL;
 	free(padd);
@@ -170,7 +168,7 @@ static void aacdec_close(struct filter_node *fn)
 }
 
 /**
- * the init function of the mp3dec filter
+ * the init function of the aacdec filter
  *
  * \sa filter::init
  */