X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=aacdec.c;h=3963bbc77edbc740fab040afd5a4d196e57d8b15;hb=fa54361d9eb07f22cbe6a59faa6321700b807f49;hp=e0890da9dcd9e95fd78884ad2e65014e89573dc7;hpb=b7a6a11306c34cb29f914b4c1ab5e01ba5ec83d5;p=paraslash.git

diff --git a/aacdec.c b/aacdec.c
index e0890da9..3963bbc7 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -16,6 +16,11 @@
  *     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 */
 
 #include "para.h"
@@ -44,6 +49,7 @@ struct private_mp4dec_data {
 	mp4AudioSpecificConfig mp4ASC;
 
 	int initialized;
+	int decoder_length;
 	unsigned char *inbuf;
 	int inbuf_len;
 	int consumed;
@@ -167,16 +173,22 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
 	padd->inbuf_len = len;
 
 	if (!padd->initialized) {
-		ret = find_esds(padd);
-		if (ret < 0)
-			goto out;
-
-		p = padd->inbuf + padd->consumed;
-		ret = E_AACDEC_INIT;
-		if (NeAACDecInit2(padd->decoder, p, ret, &rate, &channels) < 0) {
-			PARA_INFO_LOG("header not found, consumed: %d\n",
-				padd->consumed);
-			goto out;
+		padd->decoder_length = find_esds(padd);
+		if (padd->decoder_length < 0) {
+			ret = NeAACDecInit(padd->decoder, padd->inbuf,
+				padd->inbuf_len, &rate, &channels);
+			if (ret < 0) {
+				ret = E_AACDEC_INIT;
+				goto out;
+			}
+			padd->consumed = ret;
+		} else {
+			p = padd->inbuf + padd->consumed;
+			ret = E_AACDEC_INIT;
+			if (NeAACDecInit2(padd->decoder, p,
+					padd->decoder_length, &rate,
+					&channels) < 0)
+				goto out;
 		}
 		fci->samplerate = rate;
 		fci->channels = channels;
@@ -184,35 +196,48 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
 			fci->channels);
 		padd->initialized = 1;
 	}
-	padd->consumed = 0;
-	if (!padd->offset_pos) {
+	if (padd->decoder_length > 0) {
+		padd->consumed = 0;
+		if (!padd->offset_pos) {
+			ret = len;
+			if (find_stco(padd) < 0)
+				goto out;
+		}
+		if (padd->offset_pos < padd->noffsets) {
+			fill_offset_table(padd);
+			ret = padd->consumed;
+			goto out;
+		}
+//		PARA_INFO_LOG("consumed total: %lu, first_chunk: %d\n",
+//			padd->consumed_total, padd->offset[0]);
 		ret = len;
-		if (find_stco(padd) < 0)
+		if (padd->consumed_total + len < padd->offset[0])
 			goto out;
+		if (padd->consumed_total < padd->offset[0])
+			padd->consumed = padd->offset[0] - padd->consumed_total;
 	}
-	if (padd->offset_pos < padd->noffsets) {
-		fill_offset_table(padd);
-		ret = padd->consumed;
-		goto out;
+	p = memchr(padd->inbuf + padd->consumed, 0x21,
+		padd->inbuf_len - padd->consumed);
+	if (!p) {
+		padd->consumed = padd->inbuf_len;
+		goto success;
+	}
+	if (p != padd->inbuf + padd->consumed) {
+		int skip = p - padd->inbuf + padd->consumed;
+		PARA_DEBUG_LOG("skipping %d bytes in inbuffer\n", skip);
+		padd->consumed += skip;
 	}
-	PARA_INFO_LOG("consumed total: %lu, first_chunk: %d\n",
-		padd->consumed_total, padd->offset[0]);
-	ret = len;
-	if (padd->consumed_total + len < padd->offset[0])
-		goto out;
-	if (padd->consumed_total < padd->offset[0])
-		padd->consumed = padd->offset[0] - padd->consumed_total;
-	p = padd->inbuf + padd->consumed;
 	outbuffer = NeAACDecDecode(padd->decoder, &padd->frame_info, p,
 		len - padd->consumed);
-	PARA_INFO_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
-		padd->frame_info.error, padd->consumed_total,
-		padd->consumed, padd->frame_info.bytesconsumed);
 	ret = -E_AAC_DECODE;
 	if (padd->frame_info.error != 0) {
+		PARA_ERROR_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
+			padd->frame_info.error, padd->consumed_total,
+			padd->consumed, padd->frame_info.bytesconsumed);
 		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
 			padd->frame_info.error));
-		goto out;
+		padd->consumed++; /* catch 21 */
+		goto success;
 	}
 	padd->consumed += padd->frame_info.bytesconsumed;
 	ret = padd->consumed;
@@ -224,6 +249,7 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
 		fn->buf[fn->loaded++] = s[i] & 0xff;
 		fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
 	}
+success:
 	ret = padd->consumed;
 out:
 	if (ret > 0)