X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=b091db03df14212bdb3d91a36c737b24170cd64f;hp=b7e828f4d7c76287e871fee87dc17023215a80ab;hb=2349dbb8c69a97f271c8cb8440016ac5afc34dab;hpb=2187e113d02a2257cbbb02902a942946ffdc2e7e

diff --git a/aac_afh.c b/aac_afh.c
index b7e828f4..b091db03 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -15,8 +15,12 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
-/** \file aac_afh.c para_server's aac audio format handler */
+/*
+ * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
+ * Ahead Software AG
+ */
 
+/** \file aac_afh.c para_server's aac audio format handler */
 
 #include "server.cmdline.h"
 #include "server.h"
@@ -31,10 +35,10 @@
 static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
-static unsigned inbuf_len;
+static size_t inbuf_len;
 struct audio_format *af;
-
-static unsigned num_chunks, entry;
+static size_t num_chunks;
+static size_t entry;
 
 static size_t *chunk_table;
 NeAACDecHandle handle;
@@ -44,7 +48,7 @@ static void aac_close_audio_file(void)
 {
 }
 
-static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
+static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 {
 	int i;
 
@@ -66,14 +70,13 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
 		return sample_count;
 	}
 	PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
-	return -E_STCO;
+	return -E_STSZ;
 }
 
-
-static int read_stsz(unsigned skip)
+static int read_chunk_table(size_t skip)
 {
 	int ret, i;
-	long unsigned sum = 0;
+	size_t sum = 0;
 
 	for (;;) {
 		ret = aac_find_stsz(inbuf, inbuf_len, &skip);
@@ -85,7 +88,7 @@ static int read_stsz(unsigned skip)
 		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
 	}
 	num_chunks = ret;
-	PARA_INFO_LOG("sz table has %d entries\n", num_chunks);
+	PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
 	free(chunk_table);
 	chunk_table = para_malloc(num_chunks * sizeof(size_t));
 	for (i = 0; i < num_chunks; i++) {
@@ -97,26 +100,26 @@ static int read_stsz(unsigned skip)
 				return -E_AAC_READ;
 			inbuf_len = ret + skip;
 			skip = 0;
-			PARA_INFO_LOG("next buffer: %d bytes\n", inbuf_len);
+			PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
 		}
 		sum += aac_read_int32(inbuf + skip);
 		chunk_table[i] = sum;
 		skip += 4;
 		if (i < 10 || i > num_chunks - 10)
-			PARA_DEBUG_LOG("offset #%d: %d\n", i, chunk_table[i]);
+			PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
 	}
 	return 1;
 
 }
 
-
 /*
  * Init m4a file and write some tech data to given pointers.
  */
 static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	int *seconds)
 {
-	int ret, skip, decoder_len;
+	int ret, decoder_len;
+	size_t skip;
 	unsigned long rate = 0;
 	unsigned char channels = 0;
 	mp4AudioSpecificConfig mp4ASC;
@@ -151,12 +154,12 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	} else
 		PARA_WARNING_LOG("no mp4ASC %s\n", "");
 
-	ret = read_stsz(skip);
+	ret = read_chunk_table(skip);
 	if (ret < 0)
 		return ret;
 	*frames = num_chunks;
 	for (;;) {
-		ret = aac_find_entry(inbuf, inbuf_len, &skip);
+		ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
 		if (ret >= 0)
 			break;
 		ret = read(fileno(infile), inbuf, inbuf_size);
@@ -165,10 +168,10 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
 	}
 	entry = ret;
-	PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks,
+	PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
 		entry);
 #if 1
-	sprintf(info_str, "audio_file_info1:%d x %lums\n"
+	sprintf(info_str, "audio_file_info1:%zu x %lums\n"
 		"audio_file_info2:\n"
 		"audio_file_info3:\n",
 		num_chunks,
@@ -179,7 +182,7 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	struct timeval total_tv;
 	tv_scale(num_chunks, &af->chunk_tv, &total_tv);
 	*seconds = tv2ms(&total_tv) / 1000;
-	PARA_INFO_LOG("%d seconds, %d chunks\n", *seconds, num_chunks);
+	PARA_INFO_LOG("%d seconds, %zu chunks\n", *seconds, num_chunks);
 	}
 #endif
 	return 1;
@@ -190,7 +193,8 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
  */
 static int aac_reposition_stream(long unsigned request)
 {
-	return -E_AAC_REPOS;
+	return 1;
+//	return -E_AAC_REPOS;
 }
 
 static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
@@ -203,7 +207,7 @@ static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *s
 	return -E_FREAD;
 }
 
-char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
+static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 {
 	int ret;
 	size_t pos;
@@ -212,14 +216,11 @@ char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 	if (current_chunk >= num_chunks)
 		return NULL;
 	if (!current_chunk) {
-		*len = entry;
-		pos = 0;
-	} else if (current_chunk == 1) {
 		*len = chunk_table[0];
 		pos = entry;
 	} else {
-		*len = chunk_table[current_chunk - 1] - chunk_table[current_chunk - 2];
-		pos = entry + chunk_table[current_chunk - 2];
+		*len = chunk_table[current_chunk] - chunk_table[current_chunk - 1];
+		pos = entry + chunk_table[current_chunk - 1];
 	}
 	if (inbuf_size < *len) {
 		inbuf = para_realloc(inbuf, *len);