X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_common.c;h=90ad67b3074c7d2d18e3ad8efa20df6492466802;hp=43e56000c4c4c1fab3746153dbb06a28a498f91d;hb=c2eecbd1d8445b6605f0d07aea0ed9a66499e5dd;hpb=f2fa810c4bac275b4dc3ea9cd8b48d77e204618d

diff --git a/aac_common.c b/aac_common.c
index 43e56000..90ad67b3 100644
--- a/aac_common.c
+++ b/aac_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     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
@@ -20,7 +20,7 @@
  * Ahead Software AG
  */
 
-/** \file aac_ccomon.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"
@@ -42,11 +42,11 @@ NeAACDecHandle aac_open(void)
 	return h;
 };
 
-static int aac_read_decoder_length(unsigned char *buf, int *description_len)
+static unsigned long aac_read_decoder_length(unsigned char *buf, int *description_len)
 {
 	uint8_t b;
 	uint8_t numBytes = 0;
-	uint32_t length = 0;
+	unsigned long length = 0;
 
 	do {
 		b = buf[numBytes];
@@ -58,19 +58,32 @@ static int aac_read_decoder_length(unsigned char *buf, int *description_len)
 	return length;
 }
 
-int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip)
+/**
+ * search for the position and the length of the decoder configuration
+ *
+ * \param buf buffer to seach
+ * \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 positive on success, negative on errors
+ */
+int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
+		unsigned long *decoder_length)
 {
-	int i;
+	size_t i;
 
 	for (i = 0; i + 4 < buflen; i++) {
 		unsigned char *p = buf + i;
-		int decoder_length, description_len;
+		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@%d, next: %x\n", i, *p);
+		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, *p);
 		if (*p == 3)
 			i += 8;
 		else
@@ -86,21 +99,15 @@ int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip)
 			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;
 }
 
-unsigned aac_read_int32(unsigned char *buf)
-{
-	uint8_t *d = (uint8_t*)buf;
-	return (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
-}
-
 /**
  * search for the first entry in the stco table
  *
@@ -112,25 +119,24 @@ unsigned aac_read_int32(unsigned char *buf)
  * \return the position of the first entry in the table on success,
  * -E_STCO on errors.
  */
-
-int aac_find_entry_point(unsigned char *buf, unsigned buflen, int *skip)
+ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip)
 {
-	int i, ret;
+	ssize_t ret;
+	size_t i;
 
 	for (i = 0; i + 20 < buflen; i++) {
 		unsigned char *p = buf + i;
 
 		if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
 			continue;
-		PARA_INFO_LOG("found stco@%d\n", i);
+		PARA_INFO_LOG("found stco@%zu\n", i);
 		i += 12;
 		ret = aac_read_int32(buf + i); /* first offset */
 		i += 4;
-		PARA_INFO_LOG("num entries: %d\n", ret);
+		PARA_INFO_LOG("entry point: %zd\n", ret);
 		*skip = i;
 		return ret;
 	}
-	PARA_WARNING_LOG("stco not found, buflen: %d\n", buflen);
+	PARA_WARNING_LOG("stco not found, buflen: %zu\n", buflen);
 	return -E_STCO;
 }
-