X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=d5ec442b9bdce9b6507ea9d3c1559d2eee73da22;hp=a8d162e4b7de7a895969c53ada0fb67a9c08367e;hb=ad14b0d7021aa16a71098eeb70eaba66017ec53a;hpb=ccf42979a31a56e991b5c6d7d4043381f7487d6e;ds=sidebyside

diff --git a/aac_afh.c b/aac_afh.c
index a8d162e4..d5ec442b 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,26 @@
 
 #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)
 {
@@ -109,11 +110,24 @@ static int read_chunk_table(size_t skip)
 		sum += aac_read_int32(inbuf + skip);
 		chunk_table[i] = sum;
 		skip += 4;
-		if (i < 10 || i > num_chunks - 10)
+		if (i < 10 || i + 10 > num_chunks)
 			PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
 	}
 	return 1;
+}
 
+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;
+	struct timeval total;
+
+	ms2tv(ms, &total);
+	tv_divide(num_chunks, &total, &af->chunk_tv);
+	PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+		mp4ASC->samplingFrequency, ms / 1000,
+		num_chunks, tv2ms(&af->chunk_tv));
+	return ms / 1000;
 }
 
 /*
@@ -133,12 +147,9 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	inbuf = para_malloc(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);
 	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)
@@ -151,17 +162,15 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 		return -E_AACDEC_INIT;
 	skip += ret;
 	PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
-	ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip, &mp4ASC);
-	if (ret >= 0) {
-		PARA_DEBUG_LOG("mp4ASC.samplingFrequency: %lu\n",
-			mp4ASC.samplingFrequency);
-	} else
-		PARA_WARNING_LOG("no mp4ASC %s\n", "");
-
+	ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
+		&mp4ASC);
+	if (ret < 0)
+		return -E_MP4ASC;
 	ret = read_chunk_table(skip);
 	if (ret < 0)
 		return ret;
 	*frames = num_chunks;
+	*seconds = aac_set_chunk_tv(&mp4ASC);
 	for (;;) {
 		ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
 		if (ret >= 0)
@@ -172,33 +181,21 @@ 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 %zu entries, entry: %zu\n", num_chunks,
-		entry);
-#if 1
 	sprintf(info_str, "audio_file_info1:%zu x %lums\n"
 		"audio_file_info2:\n"
 		"audio_file_info3:\n",
 		num_chunks,
 		tv2ms(&af->chunk_tv));
-#endif
-#if 1
-	{
-	struct timeval total_tv;
-	tv_scale(num_chunks, &af->chunk_tv, &total_tv);
-	*seconds = tv2ms(&total_tv) / 1000;
-	PARA_INFO_LOG("%d seconds, %zu chunks\n", *seconds, num_chunks);
-	}
-#endif
+	tv_scale(20, &af->chunk_tv, &af->eof_tv);
 	return 1;
 }
 
 /*
- * 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)
@@ -233,7 +230,7 @@ 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)
 {
@@ -243,8 +240,5 @@ void aac_afh_init(struct audio_format_handler *p)
 	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 = 23120;
-	tv_scale(3, &af->chunk_tv, &af->eof_tv);
 	af->suffixes = aac_suffixes;
 }