X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=0a80bfcf3a44205ea7d42f9ac260c03f910ba199;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=fdb0339c7715bf9e319c03bdf6990ecac1814313;hpb=c44992109c344de0b0090dbb2a72ffb261185be8;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index fdb0339c..0a80bfcf 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -22,12 +22,11 @@ struct aac_afh_context {
 	const void *map;
 	size_t mapsize;
 	size_t fpos;
-	int32_t track;
 	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;
 	size_t have, rv;
@@ -35,7 +34,7 @@ static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
 	if (want == 0 || c->fpos >= c->mapsize)
 		return 0;
 	have = c->mapsize - c->fpos;
-	rv = PARA_MIN(have, (size_t)want);
+	rv = PARA_MIN(have, want);
 	PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos);
 	memcpy(dest, c->map + c->fpos, rv);
 	c->fpos += rv;
@@ -49,17 +48,6 @@ static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
 	return 0;
 }
 
-static int32_t aac_afh_get_track(struct mp4 *mp4)
-{
-	int32_t i, num_tracks = mp4_total_tracks(mp4);
-
-	assert(num_tracks >= 0);
-	for (i = 0; i < num_tracks; i++)
-		if (mp4_is_audio_track(mp4, i))
-			return i;
-	return -E_MP4_TRACK; /* no audio track */
-}
-
 static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
 {
 	int ret;
@@ -72,18 +60,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_MP4_OPEN;
-	c->mp4 = mp4_open_read(&c->cb);
-	if (!c->mp4)
-		goto free_ctx;
-	ret = aac_afh_get_track(c->mp4);
+	ret = mp4_open_read(&c->cb, &c->mp4);
 	if (ret < 0)
-		goto close_mp4;
-	c->track = ret;
+		goto free_ctx;
 	*afh_context = c;
 	return 0;
-close_mp4:
-	mp4_close(c->mp4);
 free_ctx:
 	free(c);
 	*afh_context = NULL;
@@ -103,11 +84,13 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
 	struct aac_afh_context *c = afh_context;
 	int32_t ss;
 	size_t offset;
+	int ret;
 
-	assert(chunk_num <= INT_MAX);
-	mp4_set_sample_position(c->mp4, c->track, chunk_num);
+	ret = mp4_set_sample_position(c->mp4, chunk_num);
+	if (ret < 0)
+		return ret;
 	offset = c->fpos;
-	ss = mp4_get_sample_size(c->mp4, c->track, chunk_num);
+	ss = mp4_get_sample_size(c->mp4, chunk_num);
 	if (ss <= 0)
 		return -E_MP4_BAD_SAMPLE;
 	assert(ss + offset <= c->mapsize);
@@ -118,11 +101,11 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
 
 static void _aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
 {
-	mp4_meta_get_artist(mp4, &tags->artist);
-	mp4_meta_get_title(mp4, &tags->title);
-	mp4_meta_get_date(mp4, &tags->year);
-	mp4_meta_get_album(mp4, &tags->album);
-	mp4_meta_get_comment(mp4, &tags->comment);
+	tags->artist = mp4_meta_get_artist(mp4);
+	tags->title = mp4_meta_get_title(mp4);
+	tags->year = mp4_meta_get_date(mp4);
+	tags->album = mp4_meta_get_album(mp4);
+	tags->comment = mp4_meta_get_comment(mp4);
 }
 
 /*
@@ -143,19 +126,19 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 		return ret;
 
 	ret = -E_MP4_BAD_SAMPLERATE;
-	rv = mp4_get_sample_rate(c->mp4, c->track);
+	rv = mp4_get_sample_rate(c->mp4);
 	if (rv <= 0)
 		goto close;
 	afhi->frequency = rv;
 
 	ret = -E_MP4_BAD_CHANNEL_COUNT;
-	rv = mp4_get_channel_count(c->mp4, c->track);
+	rv = mp4_get_channel_count(c->mp4);
 	if (rv <= 0)
 		goto close;
 	afhi->channels = rv;
 
 	ret = -E_MP4_BAD_SAMPLE_COUNT;
-	rv = mp4_num_samples(c->mp4, c->track);
+	rv = mp4_num_samples(c->mp4);
 	if (rv <= 0)
 		goto close;
 	afhi->chunks_total = rv;
@@ -165,7 +148,7 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 			break;
 		afhi->max_chunk_size = PARA_MAX(afhi->max_chunk_size, len);
 	}
-	milliseconds = mp4_get_duration(c->mp4, c->track);
+	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)
@@ -178,7 +161,7 @@ close:
 	return ret;
 }
 
-static uint32_t aac_afh_meta_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
 {
 	int fd = *(int *)user_data;
 	return read(fd, dest, want);
@@ -190,10 +173,10 @@ static uint32_t aac_afh_meta_seek_cb(void *user_data, uint64_t pos)
 	return lseek(fd, pos, SEEK_SET);
 }
 
-static uint32_t aac_afh_meta_write_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_write_cb(void *user_data, void *dest, size_t count)
 {
 	int fd = *(int *)user_data;
-	return write(fd, dest, want);
+	return write(fd, dest, count);
 }
 
 static uint32_t aac_afh_meta_truncate_cb(void *user_data)
@@ -203,26 +186,34 @@ static uint32_t aac_afh_meta_truncate_cb(void *user_data)
 	return ftruncate(fd, offset);
 }
 
-static void replace_tag(struct mp4_tag *tag, const char *new_val, bool *found)
-{
-	free(tag->value);
-	tag->value = para_strdup(new_val);
-	*found = true;
-}
-
-static void add_tag(struct mp4_metadata *md, const char *item, const char *value)
+static void replace_or_add_tag(const char *item, const char *value,
+		struct mp4_metadata *meta)
 {
-	md->tags[md->count].item = para_strdup(item);
-	md->tags[md->count].value = para_strdup(value);
-	md->count++;
+	uint32_t n;
+	struct mp4_tag *t;
+
+	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;
+	}
+	/* 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_afh_rewrite_tags(const char *map, size_t mapsize,
 		struct taginfo *tags, int fd, __a_unused const char *filename)
 {
-	int ret, i;
-	int32_t rv;
-	struct mp4_metadata metadata;
+	int ret;
+	struct mp4_metadata *metadata;
 	struct mp4 *mp4;
 	struct mp4_callback cb = {
 		.read = aac_afh_meta_read_cb,
@@ -231,65 +222,23 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 		.truncate = aac_afh_meta_truncate_cb,
 		.user_data = &fd
 	};
-	bool found_artist = false, found_title = false, found_album = false,
-		found_year = false, found_comment = false;
 
 	ret = write_all(fd, map, mapsize);
 	if (ret < 0)
 		return ret;
 	lseek(fd, 0, SEEK_SET);
 
-	mp4 = mp4_open_meta(&cb);
-	if (!mp4)
-		return -E_MP4_OPEN;
-
-	ret = -E_MP4_META_READ;
-	rv = mp4_meta_get_num_items(mp4);
-	if (rv < 0)
-		goto close;
-	metadata.count = rv;
-	PARA_NOTICE_LOG("%d metadata item(s) found\n", rv);
-
-	metadata.tags = para_malloc((metadata.count + 5) * sizeof(struct mp4_tag));
-	for (i = 0; i < metadata.count; i++) {
-		struct mp4_tag *tag = metadata.tags + i;
-
-		ret = -E_MP4_META_READ;
-		if (!mp4_meta_get_by_index(mp4, i, &tag->item, &tag->value))
-			goto free_tags;
-		PARA_INFO_LOG("found: %s: %s\n", tag->item, tag->value);
-		if (!strcmp(tag->item, "artist"))
-			replace_tag(tag, tags->artist, &found_artist);
-		else if (!strcmp(tag->item, "title"))
-			replace_tag(tag, tags->title, &found_title);
-		else if (!strcmp(tag->item, "album"))
-			replace_tag(tag, tags->album, &found_album);
-		else if (!strcmp(tag->item, "date"))
-			replace_tag(tag, tags->year, &found_year);
-		else if (!strcmp(tag->item, "comment"))
-			replace_tag(tag, tags->comment, &found_comment);
-	}
-	if (!found_artist)
-		add_tag(&metadata, "artist", tags->artist);
-	if (!found_title)
-		add_tag(&metadata, "title", tags->title);
-	if (!found_album)
-		add_tag(&metadata, "album", tags->album);
-	if (!found_year)
-		add_tag(&metadata, "date", tags->year);
-	if (!found_comment)
-		add_tag(&metadata, "comment", tags->comment);
-	ret = -E_MP4_META_WRITE;
-	if (!mp4_meta_update(&cb, &metadata))
-		goto free_tags;
-	ret = 1;
-free_tags:
-	for (; i > 0; i--) {
-		free(metadata.tags[i - 1].item);
-		free(metadata.tags[i - 1].value);
-	}
-	free(metadata.tags);
-close:
+	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_meta_update(mp4);
 	mp4_close(mp4);
 	return ret;
 }