X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=cd374c818709e6a520910b7c58cc55df5071a2e9;hp=d5ec442b9bdce9b6507ea9d3c1559d2eee73da22;hb=a4a2f9112b1ffb54f0c677523cc8e6a0e384d751;hpb=505cfe0c6c8f9ef79d259ee64404ab40f2057081

diff --git a/aac_afh.c b/aac_afh.c
index d5ec442b..cd374c81 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -25,25 +25,18 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "vss.h"
-#include "afh.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 #include "fd.h"
 
 /** size of the input buffer, must be big enough to hold header */
-#define DEFAULT_INBUF_SIZE 65536
+#define AAC_INBUF_SIZE 65536
 
+static struct audio_format_handler *af;
 static FILE *infile;
-static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;
-static struct audio_format_handler *af;
-static size_t num_chunks;
-static size_t entry;
-
-static size_t *chunk_table;
-static NeAACDecHandle handle;
 
 static void aac_close_audio_file(void)
 {
@@ -51,6 +44,8 @@ static void aac_close_audio_file(void)
 		return;
 	fclose(infile);
 	infile = NULL;
+	free(inbuf);
+	inbuf = NULL;
 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
@@ -78,7 +73,7 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 	return -E_STSZ;
 }
 
-static int read_chunk_table(size_t skip)
+static int read_chunk_table(struct audio_format_info *afi, size_t skip)
 {
 	int ret, i;
 	size_t sum = 0;
@@ -87,20 +82,19 @@ static int read_chunk_table(size_t skip)
 		ret = aac_find_stsz(inbuf, inbuf_len, &skip);
 		if (ret >= 0)
 			break;
-		ret = read(fileno(infile), inbuf, inbuf_size);
+		ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
 		if (ret <= 0)
 			return -E_AAC_READ;
 		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
 	}
-	num_chunks = ret;
-	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++) {
+	afi->chunks_total = ret;
+	PARA_INFO_LOG("sz table has %lu entries\n", afi->chunks_total);
+	afi->chunk_table = para_malloc((afi->chunks_total + 1) * sizeof(size_t));
+	for (i = 1; i <= afi->chunks_total; i++) {
 		if (skip + 4 > inbuf_len) {
 			skip = inbuf_len - skip;
 			memmove(inbuf, inbuf + inbuf_len - skip, skip);
-			ret = read(fileno(infile), inbuf + skip, inbuf_size - skip);
+			ret = read(fileno(infile), inbuf + skip, AAC_INBUF_SIZE - skip);
 			if (ret <= 0)
 				return -E_AAC_READ;
 			inbuf_len = ret + skip;
@@ -108,46 +102,45 @@ static int read_chunk_table(size_t skip)
 			PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
 		}
 		sum += aac_read_int32(inbuf + skip);
-		chunk_table[i] = sum;
+		afi->chunk_table[i] = sum;
 		skip += 4;
-		if (i < 10 || i + 10 > num_chunks)
-			PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
+		if (i < 10 || i + 10 > afi->chunks_total)
+			PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
 	}
 	return 1;
 }
 
-static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
+		mp4AudioSpecificConfig *mp4ASC)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
-		ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
+		ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
 	struct timeval total;
 
 	ms2tv(ms, &total);
-	tv_divide(num_chunks, &total, &af->chunk_tv);
-	PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+	tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+	PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
 		mp4ASC->samplingFrequency, ms / 1000,
-		num_chunks, tv2ms(&af->chunk_tv));
+		afi->chunks_total, tv2ms(&afi->chunk_tv));
 	return ms / 1000;
 }
 
 /*
  * 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)
+static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
-	int ret, decoder_len;
+	int i, ret, decoder_len;
 	size_t skip;
 	unsigned long rate = 0;
 	unsigned char channels = 0;
 	mp4AudioSpecificConfig mp4ASC;
+	NeAACDecHandle handle;
 
-	free(inbuf);
-	inbuf_size = DEFAULT_INBUF_SIZE;
-	inbuf = para_malloc(inbuf_size);
+	inbuf = para_malloc(AAC_INBUF_SIZE);
 	infile = file;
 
-	ret = read(fileno(infile), inbuf, inbuf_size);
+	ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
 	if (ret <= 0)
 		return -E_AAC_READ;
 	inbuf_len = ret;
@@ -166,79 +159,37 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 		&mp4ASC);
 	if (ret < 0)
 		return -E_MP4ASC;
-	ret = read_chunk_table(skip);
+	ret = read_chunk_table(afi, skip);
 	if (ret < 0)
 		return ret;
-	*frames = num_chunks;
-	*seconds = aac_set_chunk_tv(&mp4ASC);
+	afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
 	for (;;) {
 		ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
 		if (ret >= 0)
 			break;
-		ret = read(fileno(infile), inbuf, inbuf_size);
+		ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
 		if (ret <= 0)
 			return -E_AAC_READ;
 		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
 	}
-	entry = ret;
-	sprintf(info_str, "audio_file_info1:%zu x %lums\n"
+	afi->chunk_table[0] = ret;
+	for (i = 1; i<= afi->chunks_total; i++)
+		afi->chunk_table[i] += ret;
+	sprintf(afi->info_string, "audio_file_info1:%lu x %lums\n"
 		"audio_file_info2:\n"
 		"audio_file_info3:\n",
-		num_chunks,
-		tv2ms(&af->chunk_tv));
-	tv_scale(20, &af->chunk_tv, &af->eof_tv);
+		afi->chunks_total,
+		tv2ms(&afi->chunk_tv));
+	tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
 	return 1;
 }
 
-/*
- * nothing to do as we'll seek to the correct offset in aac read_chunk() anyway
- */
-static int aac_reposition_stream(__a_unused long unsigned request)
-{
-	return 1;
-}
-
-static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-	int ret;
-	size_t pos;
-
-	*len = 0;
-	if (current_chunk >= num_chunks)
-		return NULL;
-	if (!current_chunk) {
-		*len = chunk_table[0];
-		pos = entry;
-	} else {
-		*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);
-		inbuf_size = *len;
-	}
-//	PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
-//		pos, *len);
-	ret = fseek(infile, pos, SEEK_SET);
-	if (ret < 0)
-		return NULL;
-	ret = para_fread(inbuf, *len, 1, infile);
-	if (ret != *len)
-		return NULL;
-//	PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0],
-//		(long unsigned) inbuf[4]);
-	return (char *)inbuf;
-}
-
 static const char* aac_suffixes[] = {"m4a", "mp4", NULL};
 /** the init function of the aac audio format handler */
 void aac_afh_init(struct audio_format_handler *p)
 {
 	af = p;
-	af->reposition_stream = aac_reposition_stream;
 	af->get_file_info = aac_get_file_info,
-	af->read_chunk = aac_read_chunk;
 	af->close_audio_file = aac_close_audio_file;
-	af->get_header_info = NULL;
 	af->suffixes = aac_suffixes;
 }