X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=5e5ea965eb3d31ba3241928132b4ed7594719163;hb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9;hp=956ff6dad37493e5cf95990cde50204f97c226a3;hpb=3d075bb43197cf3c5dbe23bb78e3b43a5f4bcca1;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index 956ff6da..5e5ea965 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -25,7 +25,6 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "vss.h"
-#include "afh.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
@@ -37,7 +36,7 @@
 static struct audio_format_handler *af;
 static FILE *infile;
 static unsigned char *inbuf;
-static size_t inbuf_size, inbuf_len, *chunk_table, num_chunks;
+static size_t inbuf_size, inbuf_len, num_chunks;
 
 static void aac_close_audio_file(void)
 {
@@ -47,8 +46,6 @@ static void aac_close_audio_file(void)
 	infile = NULL;
 	free(inbuf);
 	inbuf = NULL;
-	free(chunk_table);
-	chunk_table = NULL;
 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
@@ -76,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;
@@ -92,7 +89,7 @@ static int read_chunk_table(size_t skip)
 	}
 	num_chunks = ret;
 	PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
-	chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
+	afi->chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
 	for (i = 1; i <= num_chunks; i++) {
 		if (skip + 4 > inbuf_len) {
 			skip = inbuf_len - skip;
@@ -105,33 +102,33 @@ 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]);
+			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;
 	struct timeval total;
 
 	ms2tv(ms, &total);
-	tv_divide(num_chunks, &total, &af->chunk_tv);
+	tv_divide(num_chunks, &total, &afi->chunk_tv);
 	PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
 		mp4ASC->samplingFrequency, ms / 1000,
-		num_chunks, tv2ms(&af->chunk_tv));
+		num_chunks, 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, size_t **vss_chunk_table)
+static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
 	int i, ret, decoder_len;
 	size_t skip;
@@ -163,12 +160,11 @@ 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);
-	*vss_chunk_table = chunk_table;
+	afi->chunks_total = num_chunks;
+	afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
 	for (;;) {
 		ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
 		if (ret >= 0)
@@ -178,15 +174,15 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 			return -E_AAC_READ;
 		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
 	}
-	chunk_table[0] = ret;
+	afi->chunk_table[0] = ret;
 	for (i = 1; i<= num_chunks; i++)
-		chunk_table[i] += ret;
-	sprintf(info_str, "audio_file_info1:%zu x %lums\n"
+		afi->chunk_table[i] += ret;
+	sprintf(afi->info_string, "audio_file_info1:%zu 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);
+		tv2ms(&afi->chunk_tv));
+	tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
 	return 1;
 }
 
@@ -197,6 +193,5 @@ void aac_afh_init(struct audio_format_handler *p)
 	af = p;
 	af->get_file_info = aac_get_file_info,
 	af->close_audio_file = aac_close_audio_file;
-	af->get_header_info = NULL;
 	af->suffixes = aac_suffixes;
 }