X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=c4301a2f178257b19d56b3cf297da3e1eaff337c;hb=910cf7680d7a00daa68ab250003f9d800972fbe5;hp=bcf7b785e4bd5518d751b22d5b368e296e43c662;hpb=b6b571e6c6fb52207b11fc7833b272ec8cfa28bf;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index bcf7b785..c4301a2f 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG
@@ -11,78 +7,59 @@
 /** \file aac_afh.c para_server's aac audio format handler. */
 
 #include <regex.h>
-#include <mp4v2/mp4v2.h>
+#include <neaacdec.h>
 
 #include "para.h"
-#include <mp4ff.h>
+#include "mp4.h"
 #include "error.h"
 #include "portable_io.h"
 #include "afh.h"
 #include "string.h"
-#include "aac.h"
 #include "fd.h"
 
+
 struct aac_afh_context {
 	const void *map;
 	size_t mapsize;
 	size_t fpos;
-	int32_t track;
-	mp4ff_t *mp4ff;
-	mp4AudioSpecificConfig masc;
-	mp4ff_callback_t cb;
+	struct mp4 *mp4;
+	struct mp4_callback cb;
 };
 
-static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want)
 {
 	struct aac_afh_context *c = user_data;
-	uint32_t have, rv;
+	size_t have, rv;
 
-	if (want == 0 || c->fpos >= c->mapsize) {
-		PARA_INFO_LOG("failed attempt to read %u bytes @%zu\n", want,
-			c->fpos);
-		errno = EAGAIN;
-		return -1;
-	}
+	if (want == 0 || c->fpos >= c->mapsize)
+		return 0;
 	have = c->mapsize - c->fpos;
 	rv = PARA_MIN(have, want);
-	PARA_DEBUG_LOG("reading %u bytes @%zu\n", rv, c->fpos);
+	PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos);
 	memcpy(dest, c->map + c->fpos, rv);
 	c->fpos += rv;
 	return rv;
 }
 
-static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
+static off_t aac_afh_seek_cb(void *user_data, off_t offset, int whence)
 {
 	struct aac_afh_context *c = user_data;
-	c->fpos = pos;
-	return 0;
-}
 
-static int32_t aac_afh_get_track(mp4ff_t *mp4ff, mp4AudioSpecificConfig *masc)
-{
-	int32_t i, rc, num_tracks = mp4ff_total_tracks(mp4ff);
-
-	assert(num_tracks >= 0);
-	for (i = 0; i < num_tracks; i++) {
-		unsigned char *buf = NULL;
-		unsigned buf_size = 0;
-
-		mp4ff_get_decoder_config(mp4ff, i, &buf, &buf_size);
-		if (buf) {
-			rc = NeAACDecAudioSpecificConfig(buf, buf_size, masc);
-			free(buf);
-			if (rc < 0)
-				continue;
-			return i;
-		}
-	}
-	return -1; /* no audio track */
+	if (whence == SEEK_SET)
+		c->fpos = offset;
+	else if (whence == SEEK_CUR)
+		c->fpos += offset;
+	else if (whence == SEEK_END)
+		c->fpos = c->mapsize + offset;
+	else
+		assert(false);
+	return c->fpos;
 }
 
 static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
 {
 	int ret;
-	struct aac_afh_context *c = para_malloc(sizeof(*c));
+	struct aac_afh_context *c = alloc(sizeof(*c));
 
 	c->map = map;
 	c->mapsize = mapsize;
@@ -91,18 +68,11 @@ static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
 	c->cb.seek = aac_afh_seek_cb;
 	c->cb.user_data = c;
 
-	ret = -E_MP4FF_OPEN;
-	c->mp4ff = mp4ff_open_read(&c->cb);
-	if (!c->mp4ff)
+	ret = mp4_open(&c->cb, &c->mp4);
+	if (ret < 0)
 		goto free_ctx;
-	c->track = aac_afh_get_track(c->mp4ff, &c->masc);
-	ret = -E_MP4FF_TRACK;
-	if (c->track < 0)
-		goto close_mp4ff;
 	*afh_context = c;
 	return 0;
-close_mp4ff:
-	mp4ff_close(c->mp4ff);
 free_ctx:
 	free(c);
 	*afh_context = NULL;
@@ -112,349 +82,182 @@ free_ctx:
 static void aac_afh_close(void *afh_context)
 {
 	struct aac_afh_context *c = afh_context;
-	mp4ff_close(c->mp4ff);
+	mp4_close(c->mp4);
 	free(c);
 }
 
-/**
- * Libmp4ff function to reposition the file to the given sample.
- *
- * \param f The opaque handle returned by mp4ff_open_read().
- * \param track The number of the (audio) track.
- * \param sample Destination.
- *
- * We need this function to obtain the offset of the sample within the audio
- * file. Unfortunately, it is not exposed in the mp4ff header.
- *
- * \return This function always returns 0.
- */
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-static int aac_afh_get_chunk(long unsigned chunk_num, void *afh_context,
-		const char **buf, size_t *len)
+static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
+		const char **buf, uint32_t *len)
 {
 	struct aac_afh_context *c = afh_context;
-	int32_t ss;
+	uint32_t ss;
 	size_t offset;
+	int ret;
 
-	assert(chunk_num <= INT_MAX);
-	/* this function always returns zero */
-	mp4ff_set_sample_position(c->mp4ff, c->track, chunk_num);
+	ret = mp4_set_sample_position(c->mp4, chunk_num);
+	if (ret < 0)
+		return ret;
 	offset = c->fpos;
-	ss = mp4ff_read_sample_getsize(c->mp4ff, c->track, chunk_num);
-	if (ss <= 0)
-		return -E_MP4FF_BAD_SAMPLE;
-	assert(ss + offset <= c->mapsize);
+	ret = mp4_get_sample_size(c->mp4, chunk_num, &ss);
+	if (ret < 0)
+		return ret;
+	if (ss + offset > c->mapsize) /* file got truncated?! */
+		return -E_MP4_CORRUPT;
 	*buf = c->map + offset;
 	*len = ss;
 	return 1;
 }
-static int aac_find_stsz(char *buf, size_t buflen, off_t *skip)
-{
-	int i;
-
-	for (i = 0; i + 16 < buflen; i++) {
-		char *p = buf + i;
-		unsigned sample_count, sample_size;
 
-		if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
-			continue;
-		PARA_DEBUG_LOG("found stsz@%d\n", i);
-		i += 8;
-		sample_size = read_u32_be(buf + i);
-		PARA_DEBUG_LOG("sample size: %u\n", sample_size);
-		i += 4;
-		sample_count = read_u32_be(buf + i);
-		i += 4;
-		PARA_DEBUG_LOG("sample count: %u\n", sample_count);
-		*skip = i;
-		return sample_count;
-	}
-	return -E_STSZ;
-}
-
-static int atom_cmp(const char *buf1, const char *buf2)
+static void aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
 {
-	return memcmp(buf1, buf2, 4)? 1 : 0;
+	tags->artist = mp4_get_tag_value(mp4, "artist");
+	tags->title = mp4_get_tag_value(mp4, "title");
+	tags->year = mp4_get_tag_value(mp4, "date");
+	tags->album = mp4_get_tag_value(mp4, "album");
+	tags->comment = mp4_get_tag_value(mp4, "comment");
 }
 
-static int read_atom_header(char *buf, uint64_t *subsize, char type[5])
+/*
+ * Init m4a file and write some tech data to given pointers.
+ */
+static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
+		struct afh_info *afhi)
 {
-	uint64_t size = read_u32_be(buf);
+	int ret;
+	struct aac_afh_context *c;
+	uint64_t milliseconds;
+	const char *buf;
+	uint32_t n, len;
 
-	memcpy(type, buf + 4, 4);
-	type[4] = '\0';
+	ret = aac_afh_open(map, numbytes, (void **)&c);
+	if (ret < 0)
+		return ret;
 
-	PARA_DEBUG_LOG("size: %llu, type: %s\n", (long long unsigned)size, type);
-	if (size != 1) {
-		*subsize = size;
-		return 8;
+	afhi->frequency = mp4_get_sample_rate(c->mp4);
+	assert(afhi->frequency > 0);
+	afhi->channels = mp4_get_channel_count(c->mp4);
+	assert(afhi->channels > 0);
+	afhi->chunks_total = mp4_num_samples(c->mp4);
+	assert(afhi->chunks_total > 0);
+
+	afhi->max_chunk_size = 0;
+	for (n = 0; n < afhi->chunks_total; n++) {
+		ret = aac_afh_get_chunk(n, c, &buf, &len);
+		if (ret < 0)
+			goto out;
+		afhi->max_chunk_size = PARA_MAX(afhi->max_chunk_size, len);
 	}
-	buf += 4;
-	size = 0;
-	size = read_u64_be(buf);
-	*subsize = size;
-	return 16;
+	milliseconds = mp4_get_duration(c->mp4);
+	afhi->seconds_total = milliseconds / 1000;
+	ms2tv(milliseconds / afhi->chunks_total, &afhi->chunk_tv);
+	if (aac_afh_get_chunk(0, c, &buf, &len) < 0)
+		goto out;
+	numbytes -= buf - map;
+	afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000;
+	aac_afh_get_taginfo(c->mp4, &afhi->tags);
+	ret = 1;
+out:
+	aac_afh_close(c);
+	return ret;
 }
 
-static char *get_tag(char *p, int size)
+static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
 {
-	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;
+	int fd = *(int *)user_data;
+	return read(fd, dest, want);
 }
 
-static void read_tags(char *buf, size_t buflen, struct afh_info *afhi)
+static off_t aac_afh_meta_seek_cb(void *user_data, off_t offset, int whence)
 {
-	char *p = buf;
-
-	while (p + 32 < buf + buflen) {
-		char *q, type1[5], type2[5];
-		uint64_t size1, size2;
-		int ret, ret2;
+	int fd = *(int *)user_data;
+	off_t ret = lseek(fd, offset, whence);
 
-		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, "\xa9" "ART"))
-			afhi->tags.artist = get_tag(q, size2);
-		else if (!atom_cmp(type1, "\xa9" "alb"))
-			afhi->tags.album = get_tag(q, size2);
-		else if (!atom_cmp(type1, "\xa9" "nam"))
-			afhi->tags.title = get_tag(q, size2);
-		else if (!atom_cmp(type1, "\xa9" "cmt"))
-			afhi->tags.comment = get_tag(q, size2);
-		else if (!atom_cmp(type1, "\xa9" "day"))
-			afhi->tags.year = get_tag(q, size2);
-		p += size1;
-	}
+	assert(ret != (off_t)-1);
+	return ret;
 }
 
-static void read_meta(char *buf, size_t buflen, struct afh_info *afhi)
+static ssize_t aac_afh_meta_write_cb(void *user_data, void *dest, size_t count)
 {
-	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);
-	}
+	int fd = *(int *)user_data;
+	return write(fd, dest, count);
 }
 
-static void aac_get_taginfo(char *buf, size_t buflen, struct afh_info *afhi)
+static int aac_afh_meta_truncate_cb(void *user_data)
 {
-	int i;
-	uint64_t subsize;
-	char type[5];
-
-	for (i = 0; i + 24 < buflen; i++) {
-		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");
+	int fd = *(int *)user_data;
+	off_t offset = lseek(fd, 0, SEEK_CUR);
+	return ftruncate(fd, offset);
 }
 
-static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
-		char *map, size_t numbytes)
+static void replace_or_add_tag(const char *item, const char *value,
+		struct mp4_metadata *meta)
 {
-	int ret, i;
-	size_t sum = 0;
-	off_t skip;
+	uint32_t n;
+	struct mp4_tag *t;
 
-	ret = aac_find_stsz(map, numbytes, &skip);
-	if (ret < 0)
-		return ret;
-	afhi->chunks_total = ret;
-	PARA_DEBUG_LOG("sz table has %" PRIu32 " 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 += read_u32_be(map + skip);
-		afhi->chunk_table[i] = sum;
-		skip += 4;
-//		if (i < 10 || i + 10 > afhi->chunks_total)
-//			PARA_DEBUG_LOG("offset #%d: %zu\n", i, afhi->chunk_table[i]);
+	for (n = 0; n < meta->count; n++) {
+		t = meta->tags + n;
+		if (strcasecmp(t->item, item))
+			continue;
+		free(t->value);
+		t->value = para_strdup(value);
+		return;
 	}
-	return skip;
-}
-
-static int aac_set_chunk_tv(struct afh_info *afhi,
-		mp4AudioSpecificConfig *mp4ASC, uint32_t *seconds)
-{
-	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
-	struct timeval total;
-	long unsigned ms;
-
-	ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency;
-	ms2tv(ms, &total);
-	tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv);
-	PARA_INFO_LOG("%luHz, %lus (%" PRIu32 " x %lums)\n",
-		mp4ASC->samplingFrequency, ms / 1000,
-		afhi->chunks_total, tv2ms(&afhi->chunk_tv));
-	if (ms < 1000)
-		return -E_MP4ASC;
-	*seconds = ms / 1000;
-	return 1;
-}
-
-/*
- * Init m4a file and write some tech data to given pointers.
- */
-static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
-		struct afh_info *afhi)
-{
-	int i;
-	size_t skip;
-	ssize_t ret;
-	unsigned long rate = 0, decoder_len;
-	unsigned char channels = 0;
-	mp4AudioSpecificConfig mp4ASC;
-	NeAACDecHandle handle = NULL;
-
-	ret = aac_find_esds(map, numbytes, &skip, &decoder_len);
-	if (ret < 0)
-		goto out;
-	aac_get_taginfo(map, numbytes, afhi);
-	handle = aac_open();
-	ret = -E_AAC_AFH_INIT;
-	if (NeAACDecInit(handle, (unsigned char *)map + skip, decoder_len,
-			&rate, &channels))
-		goto out;
-	if (!channels)
-		goto out;
-	PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels);
-	ret = -E_MP4ASC;
-	if (NeAACDecAudioSpecificConfig((unsigned char *)map + skip,
-			numbytes - skip, &mp4ASC))
-		goto out;
-	if (!mp4ASC.samplingFrequency)
-		goto out;
-	ret = aac_compute_chunk_table(afhi, map, numbytes);
-	if (ret < 0)
-		goto out;
-	skip = ret;
-	ret = aac_set_chunk_tv(afhi, &mp4ASC, &afhi->seconds_total);
-	if (ret < 0)
-		goto out;
-	ret = aac_find_entry_point(map + skip, numbytes - skip, &skip);
-	if (ret < 0)
-		goto out;
-	afhi->chunk_table[0] = ret;
-	for (i = 1; i<= afhi->chunks_total; i++)
-		afhi->chunk_table[i] += ret;
-	set_max_chunk_size(afhi);
-	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)
-		NeAACDecClose(handle);
-	return ret;
+	/* item not found, add new tag */
+	meta->tags = para_realloc(meta->tags, (meta->count + 1)
+		* sizeof(struct mp4_tag));
+	t = meta->tags + meta->count;
+	t->item = para_strdup(item);
+	t->value = para_strdup(value);
+	meta->count++;
 }
 
-static int aac_rewrite_tags(const char *map, size_t mapsize,
-		struct taginfo *tags, int fd, const char *filename)
+static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
+		struct taginfo *tags, int fd, __a_unused const char *filename)
 {
-	MP4FileHandle h;
-	const MP4Tags *mdata;
-	int ret = write_all(fd, map, mapsize);
-
+	int ret;
+	struct mp4_metadata *metadata;
+	struct mp4 *mp4;
+	struct mp4_callback cb = {
+		.read = aac_afh_meta_read_cb,
+		.seek = aac_afh_meta_seek_cb,
+		.write = aac_afh_meta_write_cb,
+		.truncate = aac_afh_meta_truncate_cb,
+		.user_data = &fd
+	};
+
+	ret = write_all(fd, map, mapsize);
 	if (ret < 0)
 		return ret;
 	lseek(fd, 0, SEEK_SET);
-	h = MP4Modify(filename, 0);
-	if (!h) {
-		PARA_ERROR_LOG("MP4Modify() failed, fd = %d\n", fd);
-		return -E_MP4V2;
-	}
-	mdata = MP4TagsAlloc();
-	assert(mdata);
-	if (!MP4TagsFetch(mdata, h)) {
-		PARA_ERROR_LOG("MP4Tags_Fetch() failed\n");
-		ret = -E_MP4V2;
-		goto close;
-	}
 
-	if (!MP4TagsSetAlbum(mdata, tags->album)) {
-		PARA_ERROR_LOG("Could not set album\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-	if (!MP4TagsSetArtist(mdata, tags->artist)) {
-		PARA_ERROR_LOG("Could not set album\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-	if (!MP4TagsSetComments(mdata, tags->comment)) {
-		PARA_ERROR_LOG("Could not set comment\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-	if (!MP4TagsSetName(mdata, tags->title)) {
-		PARA_ERROR_LOG("Could not set title\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-	if (!MP4TagsSetReleaseDate(mdata, tags->year)) {
-		PARA_ERROR_LOG("Could not set release date\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-
-	if (!MP4TagsStore(mdata, h)) {
-		PARA_ERROR_LOG("Could not store tags\n");
-		ret = -E_MP4V2;
-		goto tags_free;
-	}
-	ret = 1;
-tags_free:
-	MP4TagsFree(mdata);
-close:
-	MP4Close(h, 0);
+	ret = mp4_open_meta(&cb, &mp4);
+	if (ret < 0)
+		return ret;
+	metadata = mp4_get_meta(mp4);
+	PARA_NOTICE_LOG("%u metadata item(s) found\n", metadata->count);
+	replace_or_add_tag("artist", tags->artist, metadata);
+	replace_or_add_tag("title", tags->title, metadata);
+	replace_or_add_tag("album", tags->album, metadata);
+	replace_or_add_tag("date", tags->year, metadata);
+	replace_or_add_tag("comment", tags->comment, metadata);
+	ret = mp4_update_meta(mp4);
+	mp4_close(mp4);
 	return ret;
 }
 
 static const char * const aac_suffixes[] = {"m4a", "mp4", NULL};
+
 /**
- * the init function of the aac audio format handler
+ * The audio format handler for the Advanced Audio Codec.
  *
- * \param afh pointer to the struct to initialize
+ * This is only compiled in if the faad library is installed.
  */
-void aac_afh_init(struct audio_format_handler *afh)
-{
-	afh->get_file_info = aac_get_file_info,
-	afh->suffixes = aac_suffixes;
-	afh->rewrite_tags = aac_rewrite_tags;
-	afh->open = aac_afh_open;
-	afh->get_chunk = aac_afh_get_chunk;
-	afh->close = aac_afh_close;
-}
+const struct audio_format_handler aac_afh = {
+	.get_file_info = aac_get_file_info,
+	.suffixes = aac_suffixes,
+	.rewrite_tags = aac_afh_rewrite_tags,
+	.open = aac_afh_open,
+	.get_chunk = aac_afh_get_chunk,
+	.close = aac_afh_close,
+};