X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_common.c;h=812c742cf668e7ad67e6f5b502fbe6c93829f0a3;hp=2dc979011be245850cef106167bd4fad611abe1e;hb=dda88dcb390a44e1f1f68f6248ed513c75dce4bf;hpb=cb26d94043cb3717aa3d27ff115cb73bbb555230;ds=sidebyside

diff --git a/aac_common.c b/aac_common.c
index 2dc97901..812c742c 100644
--- a/aac_common.c
+++ b/aac_common.c
@@ -1,34 +1,24 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG
  */
 
-/** \file aac_common.c common functions of aac_afh and aadcec */
+/** \file aac_common.c Common functions of aac_afh and aadcec. */
 
 #include "para.h"
 #include "aac.h"
 #include "error.h"
+#include "portable_io.h"
 
 /**
- * get a new libfaad decoder handle
+ * Get a new libfaad decoder handle.
  *
+ * \return The handle returned by NeAACDecOpen().
  */
 NeAACDecHandle aac_open(void)
 {
@@ -40,13 +30,13 @@ NeAACDecHandle aac_open(void)
 	c->downMatrix = 0;
 	NeAACDecSetConfiguration(h, c);
 	return h;
-};
+}
 
-static int aac_read_decoder_length(unsigned char *buf, int *description_len)
+static unsigned long aac_read_decoder_length(char *buf, int *description_len)
 {
 	uint8_t b;
 	uint8_t numBytes = 0;
-	uint32_t length = 0;
+	unsigned long length = 0;
 
 	do {
 		b = buf[numBytes];
@@ -65,42 +55,45 @@ static int aac_read_decoder_length(unsigned char *buf, int *description_len)
  * \param buflen length of \a buf
  * \param skip Upon succesful return, this contains the offset in \a buf where
  * the decoder config starts.
+ * \param decoder_length result pointer that is filled in with the length of
+ * the decoder configuration on success.
  *
- * \return The length of the decoder configuration
+ * \return positive on success, negative on errors
  */
-ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
+int aac_find_esds(char *buf, size_t buflen, size_t *skip,
+		unsigned long *decoder_length)
 {
 	size_t i;
 
 	for (i = 0; i + 4 < buflen; i++) {
-		unsigned char *p = buf + i;
-		int decoder_length, description_len;
+		char *p = buf + i;
+		int description_len;
 
 		if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
 			continue;
 		i += 8;
 		p = buf + i;
-		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, *p);
+		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, (unsigned)*p);
 		if (*p == 3)
 			i += 8;
 		else
 			i += 6;
 		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", *p);
+		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
 		if (*p != 4)
 			continue;
 		i += 18;
 		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", *p);
+		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
 		if (*p != 5)
 			continue;
 		i++;
 		p = buf + i;
-		decoder_length = aac_read_decoder_length(p, &description_len);
-		PARA_INFO_LOG("decoder length: %d\n", decoder_length);
+		*decoder_length = aac_read_decoder_length(p, &description_len);
+		PARA_INFO_LOG("decoder length: %lu\n", *decoder_length);
 		i += description_len;
 		*skip = i;
-		return decoder_length;
+		return 1;
 	}
 	return -E_ESDS;
 }
@@ -116,19 +109,19 @@ ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
  * \return the position of the first entry in the table on success,
  * -E_STCO on errors.
  */
-ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip)
+ssize_t aac_find_entry_point(char *buf, size_t buflen, size_t *skip)
 {
 	ssize_t ret;
 	size_t i;
 
 	for (i = 0; i + 20 < buflen; i++) {
-		unsigned char *p = buf + i;
+		char *p = buf + i;
 
 		if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
 			continue;
 		PARA_INFO_LOG("found stco@%zu\n", i);
 		i += 12;
-		ret = aac_read_int32(buf + i); /* first offset */
+		ret = read_u32_be(buf + i); /* first offset */
 		i += 4;
 		PARA_INFO_LOG("entry point: %zd\n", ret);
 		*skip = i;