X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=c4301a2f178257b19d56b3cf297da3e1eaff337c;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=f41b3c2b8ad82cc7deaf280c769af0ca52f4f37a;hpb=6676c08aba77219683f50c02ad7f9b0812a11749;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index f41b3c2b..c4301a2f 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -22,7 +22,6 @@ struct aac_afh_context {
 	const void *map;
 	size_t mapsize;
 	size_t fpos;
-	int32_t track;
 	struct mp4 *mp4;
 	struct mp4_callback cb;
 };
@@ -42,28 +41,25 @@ static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want)
 	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(struct mp4 *mp4)
-{
-	int32_t i, num_tracks = mp4_get_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 */
+	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;
@@ -72,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_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(&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;
@@ -101,30 +90,31 @@ 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;
 
-	ret = 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);
-	if (ss <= 0)
-		return -E_MP4_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 void _aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
+static void aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
 {
-	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);
+	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");
 }
 
 /*
@@ -134,7 +124,6 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 		struct afh_info *afhi)
 {
 	int ret;
-	int32_t rv;
 	struct aac_afh_context *c;
 	uint64_t milliseconds;
 	const char *buf;
@@ -144,38 +133,30 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	if (ret < 0)
 		return ret;
 
-	ret = -E_MP4_BAD_SAMPLERATE;
-	rv = mp4_get_sample_rate(c->mp4, c->track);
-	if (rv <= 0)
-		goto close;
-	afhi->frequency = rv;
-
-	ret = -E_MP4_BAD_CHANNEL_COUNT;
-	rv = mp4_get_channel_count(c->mp4, c->track);
-	if (rv <= 0)
-		goto close;
-	afhi->channels = rv;
-
-	ret = -E_MP4_BAD_SAMPLE_COUNT;
-	rv = mp4_num_samples(c->mp4, c->track);
-	if (rv <= 0)
-		goto close;
-	afhi->chunks_total = rv;
+	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++) {
-		if (aac_afh_get_chunk(n, c, &buf, &len) < 0)
-			break;
+		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);
 	}
-	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)
-		numbytes -= buf - map;
+	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);
+	aac_afh_get_taginfo(c->mp4, &afhi->tags);
 	ret = 1;
-close:
+out:
 	aac_afh_close(c);
 	return ret;
 }
@@ -186,19 +167,22 @@ static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
 	return read(fd, dest, want);
 }
 
-static uint32_t aac_afh_meta_seek_cb(void *user_data, uint64_t pos)
+static off_t aac_afh_meta_seek_cb(void *user_data, off_t offset, int whence)
 {
 	int fd = *(int *)user_data;
-	return lseek(fd, pos, SEEK_SET);
+	off_t ret = lseek(fd, offset, whence);
+
+	assert(ret != (off_t)-1);
+	return ret;
 }
 
-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)
+static int aac_afh_meta_truncate_cb(void *user_data)
 {
 	int fd = *(int *)user_data;
 	off_t offset = lseek(fd, 0, SEEK_CUR);
@@ -247,9 +231,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 		return ret;
 	lseek(fd, 0, SEEK_SET);
 
-	mp4 = mp4_open_meta(&cb);
-	if (!mp4)
-		return -E_MP4_OPEN;
+	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);
@@ -257,11 +241,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 	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 = -E_MP4_META_WRITE;
-	if (!mp4_meta_update(mp4))
-		goto close;
-	ret = 1;
-close:
+	ret = mp4_update_meta(mp4);
 	mp4_close(mp4);
 	return ret;
 }