X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=338b7827caf1d8d5a4399214c6c9dff92aaa77c3;hp=1f3ea6b3040dd9eafe52839a79931b9398c235f7;hb=5d1e222d208a8505c6d0e0522ecd79599db57aa8;hpb=298ad3958d76fc775dfd0503ae4b1e43dce70f04

diff --git a/aac_afh.c b/aac_afh.c
index 1f3ea6b3..338b7827 100644
--- a/aac_afh.c
+++ b/aac_afh.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
@@ -24,25 +24,25 @@
 
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
+#include "afh.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 #include "fd.h"
 
-/* must be big enough to hold header */
+/** size of the input buffer, must be big enough to hold header */
 #define DEFAULT_INBUF_SIZE 65536
 
 static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;
-struct audio_format_handler *af;
+static struct audio_format_handler *af;
 static size_t num_chunks;
-static size_t entry;
 
 static size_t *chunk_table;
-NeAACDecHandle handle;
+static NeAACDecHandle handle;
 
 static void aac_close_audio_file(void)
 {
@@ -50,6 +50,10 @@ static void aac_close_audio_file(void)
 		return;
 	fclose(infile);
 	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)
@@ -93,9 +97,8 @@ static int read_chunk_table(size_t skip)
 	}
 	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++) {
+	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;
 			memmove(inbuf, inbuf + inbuf_len - skip, skip);
@@ -113,10 +116,9 @@ static int read_chunk_table(size_t skip)
 			PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
 	}
 	return 1;
-
 }
 
-long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
 		ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
@@ -136,13 +138,12 @@ long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
 static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	int *seconds)
 {
-	int ret, decoder_len;
+	int i, ret, decoder_len;
 	size_t skip;
 	unsigned long rate = 0;
 	unsigned char channels = 0;
 	mp4AudioSpecificConfig mp4ASC;
 
-	free(inbuf);
 	inbuf_size = DEFAULT_INBUF_SIZE;
 	inbuf = para_malloc(inbuf_size);
 	infile = file;
@@ -180,7 +181,9 @@ 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);
 	}
-	entry = ret;
+	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"
 		"audio_file_info2:\n"
 		"audio_file_info3:\n",
@@ -191,12 +194,11 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 }
 
 /*
- * Simple stream reposition routine
+ * nothing to do as we'll seek to the correct offset in aac read_chunk() anyway
  */
-static int aac_reposition_stream(long unsigned request)
+static int aac_reposition_stream(__a_unused long unsigned request)
 {
 	return 1;
-//	return -E_AAC_REPOS;
 }
 
 static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
@@ -207,14 +209,13 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 	*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];
-	}
+	*len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+	if (!*len) /* nothing to send for this run */
+		return inbuf;
+	pos = chunk_table[current_chunk];
 	if (inbuf_size < *len) {
+		PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
+			current_chunk, num_chunks, *len);
 		inbuf = para_realloc(inbuf, *len);
 		inbuf_size = *len;
 	}
@@ -231,7 +232,8 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 	return (char *)inbuf;
 }
 
-static const char* aac_suffixes[] = {"m4a", NULL};
+
+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)
 {