X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=1633c00fe9a084a2f4f7090da30208b1948ffccb;hp=436005e0db128796618e6b34285dc06110a04c8e;hb=e0cb9a6e8a1fb49eb28333386937934abde29260;hpb=55f0f9461990455656bef7a36b0f963e3d676653

diff --git a/aac_afh.c b/aac_afh.c
index 436005e0..1633c00f 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
@@ -15,54 +15,134 @@
  *     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"
-#include "afs.h"
+#include "vss.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
+#include "fd.h"
 
-/* must be big enough to hold header */
-#define DEFAULT_INBUF_SIZE 65536
+/** size of the input buffer, must be big enough to hold header */
+#define AAC_INBUF_SIZE 65536
 
+static struct audio_format_handler *af;
 static FILE *infile;
-static int inbuf_size;
 static unsigned char *inbuf;
-static ssize_t *chunk_table;
-struct audio_format *af;
-
-unsigned num_chunks, chunk_num;
+static size_t inbuf_len, num_chunks;
 
-NeAACDecHandle handle;
 static void aac_close_audio_file(void)
 {
+	if (!infile)
+		return;
+	fclose(infile);
+	infile = NULL;
+	free(inbuf);
+	inbuf = NULL;
+}
+
+static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
+{
+	int i;
+
+	for (i = 0; i + 16 < buflen; i++) {
+		unsigned char *p = buf + i;
+		unsigned sample_count, sample_size;
+
+		if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
+			continue;
+		PARA_INFO_LOG("found stsz@%d\n", i);
+		i += 8;
+		sample_size = aac_read_int32(buf + i);
+		PARA_INFO_LOG("sample size: %d\n", sample_size);
+		i += 4;
+		sample_count = aac_read_int32(buf + i);
+		i += 4;
+		PARA_INFO_LOG("sample count: %d\n", sample_count);
+		*skip = i;
+		return sample_count;
+	}
+	PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
+	return -E_STSZ;
+}
+
+static int read_chunk_table(struct audio_format_info *afi, size_t skip)
+{
+	int ret, i;
+	size_t sum = 0;
+
+	for (;;) {
+		ret = aac_find_stsz(inbuf, inbuf_len, &skip);
+		if (ret >= 0)
+			break;
+		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);
+	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;
+			memmove(inbuf, inbuf + inbuf_len - skip, skip);
+			ret = read(fileno(infile), inbuf + skip, AAC_INBUF_SIZE - skip);
+			if (ret <= 0)
+				return -E_AAC_READ;
+			inbuf_len = ret + skip;
+			skip = 0;
+			PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
+		}
+		sum += aac_read_int32(inbuf + skip);
+		afi->chunk_table[i] = sum;
+		skip += 4;
+		if (i < 10 || i + 10 > num_chunks)
+			PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
+	}
+	return 1;
+}
+
+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, &afi->chunk_tv);
+	PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+		mp4ASC->samplingFrequency, ms / 1000,
+		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)
+static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
-	int ret, skip, decoder_len;
-	unsigned inbuf_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;
 
-	PARA_INFO_LOG("file: %p\n", file);
-	ret = read(fileno(infile), inbuf, inbuf_size);
-	PARA_INFO_LOG("read %d bytes\n", ret);
+	ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
 	if (ret <= 0)
 		return -E_AAC_READ;
-	PARA_INFO_LOG("checking aac %d bytes\n", ret);
 	inbuf_len = ret;
 	ret = aac_find_esds(inbuf, inbuf_len, &skip);
 	if (ret < 0)
@@ -70,52 +150,47 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	decoder_len = ret;
 	handle = aac_open();
 	ret = NeAACDecInit(handle, inbuf + skip,
-		inbuf_len - skip, &rate, &channels);
+		decoder_len, &rate, &channels);
+	if (ret < 0)
+		return -E_AACDEC_INIT;
+	skip += ret;
 	PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
-	
-	return 1;
-}
-
-/*
- * Simple stream reposition routine
- */
-static int aac_reposition_stream(long unsigned request)
-{
-	return -E_AAC_REPOS;
-}
-
-static int get_chunk_size(long unsigned chunk_num)
-{
-	int ret;
-	if (chunk_num >= num_chunks)
-		return -1;
-	ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
-	if (!ret)
+	ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
+		&mp4ASC);
+	if (ret < 0)
+		return -E_MP4ASC;
+	ret = read_chunk_table(afi, skip);
+	if (ret < 0)
 		return ret;
-#if 0
-	PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
-		chunk_num,
-		chunk_table[chunk_num],
-		chunk_table[chunk_num + 1] - 1,
-		ret);
-#endif
-	return ret;
-}
-
-char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-	return (char *)inbuf;
+	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)
+			break;
+		ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
+		if (ret <= 0)
+			return -E_AAC_READ;
+		PARA_INFO_LOG("next buffer: %d bytes\n", ret);
+	}
+	afi->chunk_table[0] = ret;
+	for (i = 1; i<= num_chunks; i++)
+		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(&afi->chunk_tv));
+	tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
+	return 1;
 }
 
-void aac_afh_init(void *p)
+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->chunk_tv.tv_sec = 0;
-	af->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(3, &af->chunk_tv, &af->eof_tv);
+	af->suffixes = aac_suffixes;
 }