X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=94b0f8b34cdb69787c86ae2dd333d7a3b1914e84;hp=d0d437e90a31bade448b3a31165bf82dfe15d2ea;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=81a2a3b91db054a34a011392256c05271ee39114;ds=inline

diff --git a/aac_afh.c b/aac_afh.c
index d0d437e9..94b0f8b3 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,10 +10,11 @@
 
 /** \file aac_afh.c para_server's aac audio format handler */
 
+#include <regex.h>
+
 #include "para.h"
-#include "afh.h"
-#include "server.h"
 #include "error.h"
+#include "afh.h"
 #include "string.h"
 #include "aac.h"
 
@@ -41,7 +42,126 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 	return -E_STSZ;
 }
 
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+static int atom_cmp(unsigned char *buf1, char *buf2)
+{
+	unsigned char *b2 = (unsigned char *)buf2;
+
+	if (buf1[0] != b2[0])
+		return 1;
+	if (buf1[1] != b2[1])
+		return 1;
+	if (buf1[2] != b2[2])
+		return 1;
+	if (buf1[3] != b2[3])
+		return 1;
+	return 0;
+}
+
+static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char type[5])
+{
+	int i;
+	uint64_t size = (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
+
+	memcpy(type, buf + 4, 4);
+	type[4] = '\0';
+
+	PARA_DEBUG_LOG("size: %llu, type: %s\n", (long long unsigned)size, type);
+	if (size != 1) {
+		*subsize = size;
+		return 8;
+	}
+	buf += 4;
+	size = 0;
+	for (i = 0; i < 8; i++)
+		size |= ((uint64_t)buf[i]) << ((7 - i) * 8);
+	*subsize = size;
+	return 16;
+}
+
+static char *get_tag(unsigned char *p, int size)
+{
+	char *buf;
+
+	assert(size > 0);
+	buf = para_malloc(size + 1);
+
+	memcpy(buf, p, size);
+	buf[size] = '\0';
+	PARA_DEBUG_LOG("size: %d: %s\n", size, buf);
+	return buf;
+}
+
+static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi)
+{
+	unsigned char *p = buf;
+
+	while (p + 32 < buf + buflen) {
+		unsigned char *q, type1[5], type2[5];
+		uint64_t size1, size2;
+		int ret, ret2;
+
+		ret = read_atom_header(p, &size1, type1);
+		ret2 = read_atom_header(p + ret, &size2, type2);
+
+		if (size2 <= 16 || atom_cmp(type2, "data")) {
+			p += size1;
+			continue;
+		}
+		size2 -= 16;
+		q = p + ret + ret2 + 8;
+		if (q + size2 > buf + buflen)
+			break;
+		if (!atom_cmp(type1, "©ART"))
+			afhi->tags.artist = get_tag(q, size2);
+		else if (!atom_cmp(type1, "©alb"))
+			afhi->tags.album = get_tag(q, size2);
+		else if (!atom_cmp(type1, "©nam"))
+			afhi->tags.title = get_tag(q, size2);
+		else if (!atom_cmp(type1, "©cmt"))
+			afhi->tags.comment = get_tag(q, size2);
+		else if (!atom_cmp(type1, "©day"))
+			afhi->tags.year = get_tag(q, size2);
+		p += size1;
+	}
+}
+
+static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi)
+{
+	unsigned char *p = buf;
+
+	while (p + 4 < buf + buflen) {
+
+		if (p[0] != 'i' || p[1] != 'l' || p[2] != 's' || p[3] != 't') {
+			p++;
+			continue;
+		}
+		p += 4;
+		return read_tags(p, buflen - (p - buf), afhi);
+	}
+}
+
+static void aac_get_taginfo(unsigned char *buf, size_t buflen,
+		struct afh_info *afhi)
+{
+	int i;
+	uint64_t subsize;
+	unsigned char type[5];
+
+	for (i = 0; i + 24 < buflen; i++) {
+		unsigned char *p = buf + i;
+		if (p[0] != 'm' || p[1] != 'e' || p[2] != 't' || p[3] != 'a')
+			continue;
+		PARA_INFO_LOG("found metadata at offset %d\n", i);
+		i += 8;
+		p = buf + i;
+		i += read_atom_header(p, &subsize, type);
+		p = buf + i;
+		return read_meta(p, buflen - i, afhi);
+	}
+	PARA_INFO_LOG("no meta data\n");
+}
+
+static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
 		unsigned char *map, size_t numbytes)
 {
 	int ret, i;
@@ -51,37 +171,37 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
 	ret = aac_find_stsz(map, numbytes, &skip);
 	if (ret < 0)
 		return ret;
-	afi->chunks_total = ret;
-	PARA_DEBUG_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++) {
+	afhi->chunks_total = ret;
+	PARA_DEBUG_LOG("sz table has %lu entries\n", afhi->chunks_total);
+	afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * sizeof(size_t));
+	for (i = 1; i <= afhi->chunks_total; i++) {
 		if (skip + 4 > numbytes)
 			break;
 		sum += aac_read_int32(map + skip);
-		afi->chunk_table[i] = sum;
+		afhi->chunk_table[i] = sum;
 		skip += 4;
-//		if (i < 10 || i + 10 > afi->chunks_total)
-//			PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
+//		if (i < 10 || i + 10 > afhi->chunks_total)
+//			PARA_DEBUG_LOG("offset #%d: %zu\n", i, afhi->chunk_table[i]);
 	}
 	return skip;
 }
 
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afhi,
 		mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
 	struct timeval total;
-	long unsigned ms = 1000.0 * afi->chunks_total * tmp
+	long unsigned ms = 1000.0 * afhi->chunks_total * tmp
 		/ mp4ASC->samplingFrequency;
 
 	if (!mp4ASC->samplingFrequency)
 		return -E_MP4ASC;
-	ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
+	ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency;
 	ms2tv(ms, &total);
-	tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+	tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv);
 	PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
 		mp4ASC->samplingFrequency, ms / 1000,
-		afi->chunks_total, tv2ms(&afi->chunk_tv));
+		afhi->chunks_total, tv2ms(&afhi->chunk_tv));
 	if (ms < 1000)
 		return -E_MP4ASC;
 	*seconds = ms / 1000;
@@ -91,8 +211,8 @@ static int aac_set_chunk_tv(struct audio_format_info *afi,
 /*
  * Init m4a file and write some tech data to given pointers.
  */
-static int aac_get_file_info(char *map, size_t numbytes,
-		struct audio_format_info *afi)
+static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
+		struct afh_info *afhi)
 {
 	int i;
 	size_t skip;
@@ -106,6 +226,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
 	ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
 	if (ret < 0)
 		goto out;
+	aac_get_taginfo(umap, numbytes, afhi);
 	handle = aac_open();
 	ret = -E_AAC_AFH_INIT;
 	if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels))
@@ -118,32 +239,24 @@ static int aac_get_file_info(char *map, size_t numbytes,
 		goto out;
 	if (!mp4ASC.samplingFrequency)
 		goto out;
-	ret = aac_compute_chunk_table(afi, umap, numbytes);
+	ret = aac_compute_chunk_table(afhi, umap, numbytes);
 	if (ret < 0)
 		goto out;
 	skip = ret;
-	ret = aac_set_chunk_tv(afi, &mp4ASC, &afi->seconds_total);
+	ret = aac_set_chunk_tv(afhi, &mp4ASC, &afhi->seconds_total);
 	if (ret < 0)
 		goto out;
 	ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip);
 	if (ret < 0)
 		goto out;
-	afi->chunk_table[0] = ret;
-	for (i = 1; i<= afi->chunks_total; i++)
-		afi->chunk_table[i] += ret;
-	afi->channels = channels;
-	afi->frequency = rate;
-	ret = (afi->chunk_table[afi->chunks_total] - afi->chunk_table[0]) * 8; /* bits */
-	ret += (channels * afi->seconds_total * 500); /* avoid rounding error */
-	afi->bitrate = ret / (channels * afi->seconds_total * 1000);
-	sprintf(afi->info_string, "audio_file_info1:%lu x %lums, "
-		"%uHz, %d channel%s, %ukb/s\n"
-		"audio_file_info2:\n"
-		"audio_file_info3:\n",
-		afi->chunks_total, tv2ms(&afi->chunk_tv),
-		afi->frequency, channels, channels == 1? "" : "s", afi->bitrate
-	);
-	tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
+	afhi->chunk_table[0] = ret;
+	for (i = 1; i<= afhi->chunks_total; i++)
+		afhi->chunk_table[i] += ret;
+	afhi->channels = channels;
+	afhi->frequency = rate;
+	ret = (afhi->chunk_table[afhi->chunks_total] - afhi->chunk_table[0]) * 8; /* bits */
+	ret += (channels * afhi->seconds_total * 500); /* avoid rounding error */
+	afhi->bitrate = ret / (channels * afhi->seconds_total * 1000);
 	ret = 1;
 out:
 	if (handle)