X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=c97fa477931985bb039e18b023bcd4e67ce8c6d2;hb=5cc405db433ea1bc934503ebb457c639190c40a0;hp=345775b247d0cf417dff7bb5f513ab0e7a86773b;hpb=9e876b72c811a1cb77b6ecbd4cba6f5b648be662;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index 345775b2..c97fa477 100644
--- a/mp4.c
+++ b/mp4.c
@@ -12,26 +12,79 @@
 #include "string.h"
 #include "mp4.h"
 
-int32_t mp4ff_total_tracks(const mp4ff_t * f)
+struct mp4_track {
+	bool is_audio;
+	int32_t channelCount;
+	uint16_t sampleRate;
+
+	/* stsz */
+	int32_t stsz_sample_size;
+	int32_t stsz_sample_count;
+	int32_t *stsz_table;
+
+	/* stts */
+	int32_t stts_entry_count;
+	int32_t *stts_sample_count;
+	int32_t *stts_sample_delta;
+
+	/* stsc */
+	int32_t stsc_entry_count;
+	int32_t *stsc_first_chunk;
+	int32_t *stsc_samples_per_chunk;
+	int32_t *stsc_sample_desc_index;
+
+	/* stsc */
+	int32_t stco_entry_count;
+	int32_t *stco_chunk_offset;
+
+	uint32_t timeScale;
+	uint64_t duration;
+};
+
+#define MAX_TRACKS 1024
+
+struct mp4 {
+	const struct mp4_callback *cb;
+	int64_t current_position;
+
+	uint64_t moov_offset;
+	uint64_t moov_size;
+	uint8_t last_atom;
+	uint64_t file_size;
+
+	uint32_t read_error;
+	uint32_t error;
+
+	/* incremental track index while reading the file */
+	int32_t total_tracks;
+
+	/* track data */
+	struct mp4_track *track[MAX_TRACKS];
+
+	/* metadata */
+	struct mp4_metadata tags;
+};
+
+int32_t mp4_total_tracks(const struct mp4 *f)
 {
 	return f->total_tracks;
 }
 
-static int32_t read_data(mp4ff_t * f, void *data, uint32_t size)
+static int32_t read_data(struct mp4 *f, void *data, uint32_t size)
 {
 	int32_t result = 1;
 
-	result = f->stream->read(f->stream->user_data, data, size);
+	result = f->cb->read(f->cb->user_data, data, size);
 
 	if (result < size)
-		f->stream->read_error++;
+		f->read_error++;
 
 	f->current_position += size;
 
 	return result;
 }
 
-static uint64_t read_int64(mp4ff_t * f)
+static uint64_t read_int64(struct mp4 *f)
 {
 	uint8_t data[8];
 
@@ -39,25 +92,12 @@ static uint64_t read_int64(mp4ff_t * f)
 	return read_u64_be(data);
 }
 
-/* comnapre 2 atom names, returns 1 for equal, 0 for unequal */
-static int32_t atom_compare(const int8_t a1, const int8_t b1,
-				  const int8_t c1, const int8_t d1,
-				  const int8_t a2, const int8_t b2,
-				  const int8_t c2, const int8_t d2)
+static bool atom_compare(int8_t a1, int8_t b1, int8_t c1, int8_t d1,
+		int8_t a2, int8_t b2, int8_t c2, int8_t d2)
 {
-	if (a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2)
-		return 1;
-	else
-		return 0;
+	return a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2;
 }
 
-enum tracks {
-	TRACK_UNKNOWN = 0,
-	TRACK_AUDIO  = 1,
-	TRACK_VIDEO = 2,
-	TRACK_SYSTEM = 3
-};
-
 enum atoms {
 	/* atoms with subatoms */
 	ATOM_MOOV = 1,
@@ -142,8 +182,7 @@ enum atoms {
 
 #define COPYRIGHT_SYMBOL ((int8_t)0xA9)
 
-static uint8_t atom_name_to_type(const int8_t a, const int8_t b,
-		const int8_t c, const int8_t d)
+static uint8_t atom_name_to_type(int8_t a, int8_t b, int8_t c, int8_t d)
 {
 	if (a == 'm') {
 		if (atom_compare(a, b, c, d, 'm', 'o', 'o', 'v'))
@@ -298,7 +337,7 @@ static uint8_t atom_name_to_type(const int8_t a, const int8_t b,
 }
 
 /* read atom header, return atom size, atom size is with header included */
-static uint64_t atom_read_header(mp4ff_t * f, uint8_t * atom_type,
+static uint64_t atom_read_header(struct mp4 *f, uint8_t * atom_type,
 				uint8_t * header_size)
 {
 	uint64_t size;
@@ -322,7 +361,7 @@ static uint64_t atom_read_header(mp4ff_t * f, uint8_t * atom_type,
 	return size;
 }
 
-static int64_t get_position(const mp4ff_t * f)
+static int64_t get_position(const struct mp4 *f)
 {
 	return f->current_position;
 }
@@ -348,15 +387,15 @@ static int need_parse_when_meta_only(uint8_t atom_type)
 	}
 }
 
-static int32_t set_position(mp4ff_t * f, const int64_t position)
+static int32_t set_position(struct mp4 *f, int64_t position)
 {
-	f->stream->seek(f->stream->user_data, position);
+	f->cb->seek(f->cb->user_data, position);
 	f->current_position = position;
 
 	return 0;
 }
 
-static void track_add(mp4ff_t * f)
+static void track_add(struct mp4 *f)
 {
 	f->total_tracks++;
 
@@ -365,17 +404,17 @@ static void track_add(mp4ff_t * f)
 		f->error++;
 		return;
 	}
-	f->track[f->total_tracks - 1] = para_calloc(sizeof (mp4ff_track_t));
+	f->track[f->total_tracks - 1] = para_calloc(sizeof(struct mp4_track));
 }
 
-static uint8_t read_char(mp4ff_t * f)
+static uint8_t read_char(struct mp4 *f)
 {
 	uint8_t output;
 	read_data(f, &output, 1);
 	return output;
 }
 
-static uint32_t read_int24(mp4ff_t * f)
+static uint32_t read_int24(struct mp4 *f)
 {
 	int8_t data[4];
 
@@ -383,7 +422,7 @@ static uint32_t read_int24(mp4ff_t * f)
 	return read_u24_be(data);
 }
 
-static uint32_t read_int32(mp4ff_t * f)
+static uint32_t read_int32(struct mp4 *f)
 {
 	int8_t data[4];
 
@@ -391,10 +430,10 @@ static uint32_t read_int32(mp4ff_t * f)
 	return read_u32_be(data);
 }
 
-static int32_t read_stsz(mp4ff_t * f)
+static int32_t read_stsz(struct mp4 *f)
 {
 	int32_t i;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	if (f->total_tracks == 0)
 		return f->error++;
@@ -406,15 +445,15 @@ static int32_t read_stsz(mp4ff_t * f)
 	if (t->stsz_sample_size != 0)
 		return 0;
 	t->stsz_table = para_malloc(t->stsz_sample_count * sizeof(int32_t));
-	for (i = 0; i < t->stsz_sample_count && !f->stream->read_error; i++)
+	for (i = 0; i < t->stsz_sample_count && !f->read_error; i++)
 		t->stsz_table[i] = read_int32(f);
 	return 0;
 }
 
-static int32_t read_stts(mp4ff_t * f)
+static int32_t read_stts(struct mp4 *f)
 {
 	int32_t i;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	/* CVE-2017-9223 */
 	if (f->total_tracks == 0)
@@ -431,45 +470,17 @@ static int32_t read_stts(mp4ff_t * f)
 	t->stts_sample_delta = para_malloc(t->stts_entry_count
 		* sizeof (int32_t));
 	/* CVE-2017-9254 */
-	for (i = 0; i < t->stts_entry_count && !f->stream->read_error; i++) {
+	for (i = 0; i < t->stts_entry_count && !f->read_error; i++) {
 		t->stts_sample_count[i] = read_int32(f);
 		t->stts_sample_delta[i] = read_int32(f);
 	}
 	return 1;
 }
 
-static int32_t read_ctts(mp4ff_t * f)
-{
-	int32_t i;
-	mp4ff_track_t *t;
-
-	if (f->total_tracks == 0)
-		return f->error++;
-	t = f->track[f->total_tracks - 1];
-	if (t->ctts_entry_count)
-		return 0;
-
-	read_char(f);	/* version */
-	read_int24(f);	/* flags */
-	t->ctts_entry_count = read_int32(f);
-
-	t->ctts_sample_count = para_malloc(t->ctts_entry_count
-		* sizeof (int32_t));
-	t->ctts_sample_offset = para_malloc(t->ctts_entry_count
-		* sizeof (int32_t));
-
-	/* CVE-2017-9257 */
-	for (i = 0; i < t->ctts_entry_count && !f->stream->read_error; i++) {
-		t->ctts_sample_count[i] = read_int32(f);
-		t->ctts_sample_offset[i] = read_int32(f);
-	}
-	return 1;
-}
-
-static int32_t read_stsc(mp4ff_t * f)
+static int32_t read_stsc(struct mp4 *f)
 {
 	int32_t i;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	if (f->total_tracks == 0)
 		return f->error++;
@@ -485,7 +496,7 @@ static int32_t read_stsc(mp4ff_t * f)
 		sizeof (int32_t));
 
 	/* CVE-2017-9255 */
-	for (i = 0; i < t->stsc_entry_count && !f->stream->read_error; i++) {
+	for (i = 0; i < t->stsc_entry_count && !f->read_error; i++) {
 		t->stsc_first_chunk[i] = read_int32(f);
 		t->stsc_samples_per_chunk[i] = read_int32(f);
 		t->stsc_sample_desc_index[i] = read_int32(f);
@@ -493,10 +504,10 @@ static int32_t read_stsc(mp4ff_t * f)
 	return 0;
 }
 
-static int32_t read_stco(mp4ff_t * f)
+static int32_t read_stco(struct mp4 *f)
 {
 	int32_t i;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	if (f->total_tracks == 0)
 		return f->error++;
@@ -508,12 +519,12 @@ static int32_t read_stco(mp4ff_t * f)
 	t->stco_chunk_offset = para_malloc(t->stco_entry_count
 		* sizeof(int32_t));
 	/* CVE-2017-9256 */
-	for (i = 0; i < t->stco_entry_count && !f->stream->read_error; i++)
+	for (i = 0; i < t->stco_entry_count && !f->read_error; i++)
 		t->stco_chunk_offset[i] = read_int32(f);
 	return 0;
 }
 
-static uint16_t read_int16(mp4ff_t * f)
+static uint16_t read_int16(struct mp4 *f)
 {
 	int8_t data[2];
 
@@ -521,80 +532,12 @@ static uint16_t read_int16(mp4ff_t * f)
 	return read_u16_be(data);
 }
 
-static uint32_t read_mp4_descr_length(mp4ff_t * f)
-{
-	uint8_t b;
-	uint8_t numBytes = 0;
-	uint32_t length = 0;
-
-	do {
-		b = read_char(f);
-		numBytes++;
-		length = (length << 7) | (b & 0x7F);
-	} while ((b & 0x80) && numBytes < 4);
-
-	return length;
-}
-static int32_t read_esds(mp4ff_t * f)
-{
-	uint8_t tag;
-	uint32_t temp;
-	mp4ff_track_t *t;
-
-	if (f->total_tracks == 0)
-		return f->error++;
-	t = f->track[f->total_tracks - 1];
-	read_char(f);	/* version */
-	read_int24(f);	/* flags */
-	/* get and verify ES_DescrTag */
-	tag = read_char(f);
-	if (tag == 0x03) {
-		/* read length */
-		if (read_mp4_descr_length(f) < 5 + 15) {
-			return 1;
-		}
-		/* skip 3 bytes */
-		read_int24(f);
-	} else {
-		/* skip 2 bytes */
-		read_int16(f);
-	}
-
-	/* get and verify DecoderConfigDescrTab */
-	if (read_char(f) != 0x04) {
-		return 1;
-	}
-
-	/* read length */
-	temp = read_mp4_descr_length(f);
-	if (temp < 13)
-		return 1;
-
-	t->audioType = read_char(f);
-	read_int32(f);	//0x15000414 ????
-	t->maxBitrate = read_int32(f);
-	t->avgBitrate = read_int32(f);
-
-	/* get and verify DecSpecificInfoTag */
-	if (read_char(f) != 0x05) {
-		return 1;
-	}
-
-	/* read length */
-	t->decoderConfigLen = read_mp4_descr_length(f);
-	free(t->decoderConfig);
-	t->decoderConfig = para_malloc(t->decoderConfigLen);
-	read_data(f, t->decoderConfig, t->decoderConfigLen);
-	/* will skip the remainder of the atom */
-	return 0;
-}
-
-static int32_t read_mp4a(mp4ff_t * f)
+static int32_t read_mp4a(struct mp4 *f)
 {
 	int32_t i;
 	uint8_t atom_type = 0;
 	uint8_t header_size = 0;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	if (f->total_tracks == 0)
 		return f->error++;
@@ -609,7 +552,7 @@ static int32_t read_mp4a(mp4ff_t * f)
 	read_int32(f);	/* reserved */
 
 	t->channelCount = read_int16(f);
-	t->sampleSize = read_int16(f);
+	read_int16(f);
 
 	read_int16(f);
 	read_int16(f);
@@ -619,16 +562,14 @@ static int32_t read_mp4a(mp4ff_t * f)
 	read_int16(f);
 
 	atom_read_header(f, &atom_type, &header_size);
-	if (atom_type == ATOM_ESDS)
-		read_esds(f);
 	return 0;
 }
 
-static int32_t read_stsd(mp4ff_t * f)
+static int32_t read_stsd(struct mp4 *f)
 {
-	int32_t i;
+	int32_t i, entry_count;
 	uint8_t header_size = 0;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	/* CVE-2017-9218 */
 	if (f->total_tracks == 0)
@@ -638,84 +579,42 @@ static int32_t read_stsd(mp4ff_t * f)
 	read_char(f);	/* version */
 	read_int24(f);	/* flags */
 
-	t->stsd_entry_count = read_int32(f);
+	entry_count = read_int32(f);
 
 	/* CVE-2017-9253 */
-	for (i = 0; i < t->stsd_entry_count && !f->stream->read_error; i++) {
+	for (i = 0; i < entry_count && !f->read_error; i++) {
 		uint64_t skip = get_position(f);
 		uint64_t size;
 		uint8_t atom_type = 0;
 		size = atom_read_header(f, &atom_type, &header_size);
 		skip += size;
-
-		if (atom_type == ATOM_MP4A) {
-			t->type = TRACK_AUDIO;
+		t->is_audio = atom_type == ATOM_MP4A;
+		if (t->is_audio)
 			read_mp4a(f);
-		} else if (atom_type == ATOM_MP4V) {
-			t->type = TRACK_VIDEO;
-		} else if (atom_type == ATOM_MP4S) {
-			t->type = TRACK_SYSTEM;
-		} else {
-			t->type = TRACK_UNKNOWN;
-		}
 		set_position(f, skip);
 	}
 
 	return 0;
 }
 
-static int32_t read_mvhd(mp4ff_t * f)
-{
-	int32_t i;
-
-	read_char(f);	/* version */
-	read_int24(f);	/* flags */
-	read_int32(f); /* creation_time */
-	read_int32(f); /* modification_time */
-	f->time_scale = read_int32(f);
-	f->duration = read_int32(f);
-	read_int32(f); /* preferred_rate */
-	read_int16(f); /* preferred_volume */
-	for (i = 0; i < 10; i++)
-		read_char(f); /* reserved */
-	for (i = 0; i < 9; i++)
-		read_int32(f); /* matrix */
-	read_int32(f); /* preview_time */
-	read_int32(f); /* preview_duration */
-	read_int32(f); /* poster_time */
-	read_int32(f); /* selection_time */
-	read_int32(f); /* selection_duration */
-	read_int32(f); /* current_time */
-	read_int32(f); /* next_track_id */
-	return 0;
-}
-
-static int32_t tag_add_field(mp4ff_metadata_t * tags, const char *item,
+static int32_t tag_add_field(struct mp4_metadata *tags, const char *item,
 		const char *value, int32_t len)
 {
-	void *backup = (void *) tags->tags;
-
 	if (!item || (item && !*item) || !value)
 		return 0;
-
-	tags->tags = (mp4ff_tag_t *) realloc(tags->tags,
-		(tags->count + 1) * sizeof (mp4ff_tag_t));
-	if (!tags->tags) {
-		free(backup);
-		return 0;
+	tags->tags = para_realloc(tags->tags,
+		(tags->count + 1) * sizeof(struct mp4_tag));
+	tags->tags[tags->count].item = para_strdup(item);
+	tags->tags[tags->count].len = len;
+	if (len >= 0) {
+		tags->tags[tags->count].value = para_malloc(len + 1);
+		memcpy(tags->tags[tags->count].value, value, len);
+		tags->tags[tags->count].value[len] = 0;
 	} else {
-		tags->tags[tags->count].item = para_strdup(item);
-		tags->tags[tags->count].len = len;
-		if (len >= 0) {
-			tags->tags[tags->count].value = para_malloc(len + 1);
-			memcpy(tags->tags[tags->count].value, value, len);
-			tags->tags[tags->count].value[len] = 0;
-		} else {
-			tags->tags[tags->count].value = para_strdup(value);
-		}
-		tags->count++;
-		return 1;
+		tags->tags[tags->count].value = para_strdup(value);
 	}
+	tags->count++;
+	return 1;
 }
 
 static const char *ID3v1GenreList[] = {
@@ -758,7 +657,7 @@ static const char *meta_index_to_genre(uint32_t idx)
 	}
 }
 
-static char *read_string(mp4ff_t *f, uint32_t length)
+static char *read_string(struct mp4 *f, uint32_t length)
 {
 	char *str = para_malloc(length + 1);
 	if ((uint32_t)read_data(f, str, length) != length) {
@@ -769,121 +668,44 @@ static char *read_string(mp4ff_t *f, uint32_t length)
 	return str;
 }
 
-static int32_t set_metadata_name(const uint8_t atom_type, char **name)
+static const char *get_metadata_name(uint8_t atom_type)
 {
-	static char *tag_names[] = {
-		"unknown", "title", "artist", "writer", "album",
-		"date", "tool", "comment", "genre", "track",
-		"disc", "compilation", "genre", "tempo", "cover",
-		"album_artist", "contentgroup", "lyrics", "description",
-		"network", "show", "episodename",
-		"sorttitle", "sortalbum", "sortartist", "sortalbumartist",
-		"sortwriter", "sortshow",
-		"season", "episode", "podcast"
-	};
-	uint8_t tag_idx = 0;
-
 	switch (atom_type) {
-	case ATOM_TITLE:
-		tag_idx = 1;
-		break;
-	case ATOM_ARTIST:
-		tag_idx = 2;
-		break;
-	case ATOM_WRITER:
-		tag_idx = 3;
-		break;
-	case ATOM_ALBUM:
-		tag_idx = 4;
-		break;
-	case ATOM_DATE:
-		tag_idx = 5;
-		break;
-	case ATOM_TOOL:
-		tag_idx = 6;
-		break;
-	case ATOM_COMMENT:
-		tag_idx = 7;
-		break;
-	case ATOM_GENRE1:
-		tag_idx = 8;
-		break;
-	case ATOM_TRACK:
-		tag_idx = 9;
-		break;
-	case ATOM_DISC:
-		tag_idx = 10;
-		break;
-	case ATOM_COMPILATION:
-		tag_idx = 11;
-		break;
-	case ATOM_GENRE2:
-		tag_idx = 12;
-		break;
-	case ATOM_TEMPO:
-		tag_idx = 13;
-		break;
-	case ATOM_COVER:
-		tag_idx = 14;
-		break;
-	case ATOM_ALBUM_ARTIST:
-		tag_idx = 15;
-		break;
-	case ATOM_CONTENTGROUP:
-		tag_idx = 16;
-		break;
-	case ATOM_LYRICS:
-		tag_idx = 17;
-		break;
-	case ATOM_DESCRIPTION:
-		tag_idx = 18;
-		break;
-	case ATOM_NETWORK:
-		tag_idx = 19;
-		break;
-	case ATOM_SHOW:
-		tag_idx = 20;
-		break;
-	case ATOM_EPISODENAME:
-		tag_idx = 21;
-		break;
-	case ATOM_SORTTITLE:
-		tag_idx = 22;
-		break;
-	case ATOM_SORTALBUM:
-		tag_idx = 23;
-		break;
-	case ATOM_SORTARTIST:
-		tag_idx = 24;
-		break;
-	case ATOM_SORTALBUMARTIST:
-		tag_idx = 25;
-		break;
-	case ATOM_SORTWRITER:
-		tag_idx = 26;
-		break;
-	case ATOM_SORTSHOW:
-		tag_idx = 27;
-		break;
-	case ATOM_SEASON:
-		tag_idx = 28;
-		break;
-	case ATOM_EPISODE:
-		tag_idx = 29;
-		break;
-	case ATOM_PODCAST:
-		tag_idx = 30;
-		break;
-	default:
-		tag_idx = 0;
-		break;
+	case ATOM_TITLE: return "title";
+	case ATOM_ARTIST: return "artist";
+	case ATOM_WRITER: return "writer";
+	case ATOM_ALBUM: return "album";
+	case ATOM_DATE: return "date";
+	case ATOM_TOOL: return "tool";
+	case ATOM_COMMENT: return "comment";
+	case ATOM_GENRE1: return "genre";
+	case ATOM_TRACK: return "track";
+	case ATOM_DISC: return "disc";
+	case ATOM_COMPILATION: return "compilation";
+	case ATOM_GENRE2: return "genre";
+	case ATOM_TEMPO: return "tempo";
+	case ATOM_COVER: return "cover";
+	case ATOM_ALBUM_ARTIST: return "album_artist";
+	case ATOM_CONTENTGROUP: return "contentgroup";
+	case ATOM_LYRICS: return "lyrics";
+	case ATOM_DESCRIPTION: return "description";
+	case ATOM_NETWORK: return "network";
+	case ATOM_SHOW: return "show";
+	case ATOM_EPISODENAME: return "episodename";
+	case ATOM_SORTTITLE: return "sorttitle";
+	case ATOM_SORTALBUM: return "sortalbum";
+	case ATOM_SORTARTIST: return "sortartist";
+	case ATOM_SORTALBUMARTIST: return "sortalbumartist";
+	case ATOM_SORTWRITER: return "sortwriter";
+	case ATOM_SORTSHOW: return "sortshow";
+	case ATOM_SEASON: return "season";
+	case ATOM_EPISODE: return "episode";
+	case ATOM_PODCAST: return "podcast";
+	default: return "unknown";
 	}
-
-	*name = para_strdup(tag_names[tag_idx]);
-	return 0;
 }
 
-static uint32_t min_body_size(const uint8_t atom_type)
+static uint32_t min_body_size(uint8_t atom_type)
 {
 	switch(atom_type) {
 	case ATOM_GENRE2:
@@ -906,8 +728,7 @@ static uint32_t min_body_size(const uint8_t atom_type)
 	}
 }
 
-static int32_t parse_tag(mp4ff_t * f, const uint8_t parent,
-		const int32_t size)
+static int32_t parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 {
 	uint8_t atom_type;
 	uint8_t header_size = 0;
@@ -920,7 +741,7 @@ static int32_t parse_tag(mp4ff_t * f, const uint8_t parent,
 
 	for (
 		sumsize = 0;
-		sumsize < size && !f->stream->read_error; /* CVE-2017-9222 */
+		sumsize < size && !f->read_error; /* CVE-2017-9222 */
 		set_position(f, destpos), sumsize += subsize
 	) {
 		subsize = atom_read_header(f, &atom_type, &header_size);
@@ -986,22 +807,20 @@ static int32_t parse_tag(mp4ff_t * f, const uint8_t parent,
 	}
 	if (data) {
 		if (!done) {
-			if (name == NULL)
-				set_metadata_name(parent , &name);
-			if (name)
-				tag_add_field(&(f->tags), name, data, len);
+			if (!name)
+				name = para_strdup(get_metadata_name(parent));
+			tag_add_field(&(f->tags), name, data, len);
 		}
-
 		free(data);
 	}
 	free(name);
 	return 1;
 }
 
-static int32_t read_mdhd(mp4ff_t * f)
+static int32_t read_mdhd(struct mp4 *f)
 {
 	uint32_t version;
-	mp4ff_track_t *t;
+	struct mp4_track *t;
 
 	/* CVE-2017-9221 */
 	if (f->total_tracks == 0)
@@ -1029,7 +848,7 @@ static int32_t read_mdhd(mp4ff_t * f)
 	return 1;
 }
 
-static int32_t parse_metadata(mp4ff_t * f, const int32_t size)
+static int32_t parse_metadata(struct mp4 *f, int32_t size)
 {
 	uint64_t subsize, sumsize = 0;
 	uint8_t atom_type;
@@ -1046,7 +865,7 @@ static int32_t parse_metadata(mp4ff_t * f, const int32_t size)
 	return 0;
 }
 
-static int32_t read_meta(mp4ff_t * f, const uint64_t size)
+static int32_t read_meta(struct mp4 *f, uint64_t size)
 {
 	uint64_t subsize, sumsize = 0;
 	uint8_t atom_type;
@@ -1070,8 +889,7 @@ static int32_t read_meta(mp4ff_t * f, const uint64_t size)
 	return 0;
 }
 
-static int32_t atom_read(mp4ff_t *f, const int32_t size,
-		const uint8_t atom_type)
+static int32_t atom_read(struct mp4 *f, int32_t size, uint8_t atom_type)
 {
 	uint64_t dest_position = get_position(f) + size - 8;
 	if (atom_type == ATOM_STSZ) {
@@ -1080,9 +898,6 @@ static int32_t atom_read(mp4ff_t *f, const int32_t size,
 	} else if (atom_type == ATOM_STTS) {
 		/* time to sample box */
 		read_stts(f);
-	} else if (atom_type == ATOM_CTTS) {
-		/* composition offset box */
-		read_ctts(f);
 	} else if (atom_type == ATOM_STSC) {
 		/* sample to chunk box */
 		read_stsc(f);
@@ -1092,9 +907,6 @@ static int32_t atom_read(mp4ff_t *f, const int32_t size,
 	} else if (atom_type == ATOM_STSD) {
 		/* sample description box */
 		read_stsd(f);
-	} else if (atom_type == ATOM_MVHD) {
-		/* movie header box */
-		read_mvhd(f);
 	} else if (atom_type == ATOM_MDHD) {
 		/* track header */
 		read_mdhd(f);
@@ -1108,7 +920,7 @@ static int32_t atom_read(mp4ff_t *f, const int32_t size,
 }
 
 /* parse atoms that are sub atoms of other atoms */
-static int32_t parse_sub_atoms(mp4ff_t * f, const uint64_t total_size, int meta_only)
+static int32_t parse_sub_atoms(struct mp4 *f, uint64_t total_size, int meta_only)
 {
 	uint64_t size;
 	uint8_t atom_type = 0;
@@ -1142,14 +954,14 @@ static int32_t parse_sub_atoms(mp4ff_t * f, const uint64_t total_size, int meta_
 }
 
 /* parse root atoms */
-static int32_t parse_atoms(mp4ff_t * f, int meta_only)
+static int32_t parse_atoms(struct mp4 *f, int meta_only)
 {
 	uint64_t size;
 	uint8_t atom_type = 0;
 	uint8_t header_size = 0;
 
 	f->file_size = 0;
-	f->stream->read_error = 0;
+	f->read_error = 0;
 
 	while ((size =
 		atom_read_header(f, &atom_type, &header_size)) != 0) {
@@ -1175,44 +987,20 @@ static int32_t parse_atoms(mp4ff_t * f, int meta_only)
 	return 0;
 }
 
-void mp4ff_get_decoder_config(const mp4ff_t * f, const int track,
-				 unsigned char **ppBuf, unsigned int *pBufSize)
+struct mp4 *mp4_open_read(const struct mp4_callback *cb)
 {
-	if (track >= f->total_tracks) {
-		*ppBuf = NULL;
-		*pBufSize = 0;
-		return;
-	}
+	struct mp4 *f = para_calloc(sizeof(struct mp4));
 
-	if (f->track[track]->decoderConfig == NULL
-		|| f->track[track]->decoderConfigLen == 0) {
-		*ppBuf = NULL;
-		*pBufSize = 0;
-	} else {
-		*ppBuf = para_malloc(f->track[track]->decoderConfigLen);
-		memcpy(*ppBuf, f->track[track]->decoderConfig,
-			f->track[track]->decoderConfigLen);
-		*pBufSize = f->track[track]->decoderConfigLen;
+	f->cb = cb;
+	parse_atoms(f, 0);
+	if (f->error) {
+		free(f);
+		f = NULL;
 	}
+	return f;
 }
 
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t * f)
-{
-	mp4ff_t *ff = para_calloc(sizeof(mp4ff_t));
-
-	ff->stream = f;
-
-	parse_atoms(ff, 0);
-
-	if (ff->error) {
-		free(ff);
-		ff = NULL;
-	}
-
-	return ff;
-}
-
-static int32_t tag_delete(mp4ff_metadata_t * tags)
+static int32_t tag_delete(struct mp4_metadata *tags)
 {
 	uint32_t i;
 
@@ -1227,32 +1015,29 @@ static int32_t tag_delete(mp4ff_metadata_t * tags)
 	return 0;
 }
 
-void mp4ff_close(mp4ff_t * ff)
+void mp4_close(struct mp4 *f)
 {
 	int32_t i;
 
-	for (i = 0; i < ff->total_tracks; i++) {
-		if (ff->track[i]) {
-			free(ff->track[i]->stsz_table);
-			free(ff->track[i]->stts_sample_count);
-			free(ff->track[i]->stts_sample_delta);
-			free(ff->track[i]->stsc_first_chunk);
-			free(ff->track[i]->stsc_samples_per_chunk);
-			free(ff->track[i]->stsc_sample_desc_index);
-			free(ff->track[i]->stco_chunk_offset);
-			free(ff->track[i]->decoderConfig);
-			free(ff->track[i]->ctts_sample_count);
-			free(ff->track[i]->ctts_sample_offset);
-			free(ff->track[i]);
+	for (i = 0; i < f->total_tracks; i++) {
+		if (f->track[i]) {
+			free(f->track[i]->stsz_table);
+			free(f->track[i]->stts_sample_count);
+			free(f->track[i]->stts_sample_delta);
+			free(f->track[i]->stsc_first_chunk);
+			free(f->track[i]->stsc_samples_per_chunk);
+			free(f->track[i]->stsc_sample_desc_index);
+			free(f->track[i]->stco_chunk_offset);
+			free(f->track[i]);
 		}
 	}
 
-	tag_delete(&(ff->tags));
-	free(ff);
+	tag_delete(&(f->tags));
+	free(f);
 }
 
-static int32_t chunk_of_sample(const mp4ff_t * f, const int32_t track,
-		const int32_t sample, int32_t * chunk_sample, int32_t * chunk)
+static int32_t chunk_of_sample(const struct mp4 *f, int32_t track,
+		int32_t sample, int32_t *chunk_sample, int32_t *chunk)
 {
 	int32_t total_entries = 0;
 	int32_t chunk2entry;
@@ -1297,10 +1082,10 @@ static int32_t chunk_of_sample(const mp4ff_t * f, const int32_t track,
 	return 0;
 }
 
-static int32_t chunk_to_offset(const mp4ff_t * f, const int32_t track,
-		const int32_t chunk)
+static int32_t chunk_to_offset(const struct mp4 *f, int32_t track,
+		int32_t chunk)
 {
-	const mp4ff_track_t *p_track = f->track[track];
+	const struct mp4_track *p_track = f->track[track];
 
 	if (p_track->stco_entry_count && (chunk > p_track->stco_entry_count)) {
 		return p_track->stco_chunk_offset[p_track->stco_entry_count -
@@ -1314,11 +1099,11 @@ static int32_t chunk_to_offset(const mp4ff_t * f, const int32_t track,
 	return 0;
 }
 
-static int32_t sample_range_size(const mp4ff_t * f, const int32_t track,
-		const int32_t chunk_sample, const int32_t sample)
+static int32_t sample_range_size(const struct mp4 *f, int32_t track,
+		int32_t chunk_sample, int32_t sample)
 {
 	int32_t i, total;
-	const mp4ff_track_t *p_track = f->track[track];
+	const struct mp4_track *p_track = f->track[track];
 
 	if (p_track->stsz_sample_size) {
 		return (sample - chunk_sample) * p_track->stsz_sample_size;
@@ -1334,8 +1119,8 @@ static int32_t sample_range_size(const mp4ff_t * f, const int32_t track,
 	return total;
 }
 
-static int32_t sample_to_offset(const mp4ff_t * f, const int32_t track,
-		const int32_t sample)
+static int32_t sample_to_offset(const struct mp4 *f, int32_t track,
+		int32_t sample)
 {
 	int32_t chunk, chunk_sample, chunk_offset1, chunk_offset2;
 
@@ -1347,33 +1132,64 @@ static int32_t sample_to_offset(const mp4ff_t * f, const int32_t track,
 	return chunk_offset2;
 }
 
-void mp4ff_set_sample_position(mp4ff_t *f, const int32_t track,
-		const int32_t sample)
+/**
+ * Return the number of milliseconds of the given track.
+ *
+ * \param f As returned by \ref mp4_open_read(), must not be NULL.
+ * \param track Between zero and the value returned by \ref mp4_total_tracks().
+ *
+ * The function returns zero if the audio file is of zero length or contains a
+ * corrupt track header.
+ */
+uint64_t mp4_get_duration(const struct mp4 *f, int32_t track)
+{
+	const struct mp4_track *t = f->track[track];
+
+	if (t->timeScale == 0)
+		return 0;
+	return t->duration * 1000 / t->timeScale;
+}
+
+/**
+ * Check whether the given track number corresponds to an audio track.
+ *
+ * \param f See \ref mp4_get_duration().
+ * \param track See \ref mp4_get_duration().
+ *
+ * Besides audio tracks, an mp4 file may contain video and system tracks. For
+ * those the function returns false.
+ */
+bool mp4_is_audio_track(const struct mp4 *f, int32_t track)
+{
+	return f->track[track]->is_audio;
+}
+
+void mp4_set_sample_position(struct mp4 *f, int32_t track, int32_t sample)
 {
 	int32_t offset = sample_to_offset(f, track, sample);
 	set_position(f, offset);
 }
 
-int32_t mp4ff_get_sample_size(const mp4ff_t *f, int track, int sample)
+int32_t mp4_get_sample_size(const struct mp4 *f, int track, int sample)
 {
-	const mp4ff_track_t *t = f->track[track];
+	const struct mp4_track *t = f->track[track];
 
 	if (t->stsz_sample_size != 0)
 		return t->stsz_sample_size;
 	return t->stsz_table[sample];
 }
 
-uint32_t mp4ff_get_sample_rate(const mp4ff_t * f, const int32_t track)
+uint32_t mp4_get_sample_rate(const struct mp4 *f, int32_t track)
 {
 	return f->track[track]->sampleRate;
 }
 
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f, const int32_t track)
+uint32_t mp4_get_channel_count(const struct mp4 *f, int32_t track)
 {
 	return f->track[track]->channelCount;
 }
 
-int32_t mp4ff_num_samples(const mp4ff_t * f, const int32_t track)
+int32_t mp4_num_samples(const struct mp4 *f, int32_t track)
 {
 	int32_t i;
 	int32_t total = 0;
@@ -1384,28 +1200,25 @@ int32_t mp4ff_num_samples(const mp4ff_t * f, const int32_t track)
 	return total;
 }
 
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t * f)
+struct mp4 *mp4_open_meta(const struct mp4_callback *cb)
 {
-	mp4ff_t *ff = para_calloc(sizeof(mp4ff_t));
-
-	ff->stream = f;
+	struct mp4 *f = para_calloc(sizeof(struct mp4));
 
-	parse_atoms(ff, 1);
-
-	if (ff->error) {
-		free(ff);
-		ff = NULL;
+	f->cb = cb;
+	parse_atoms(f, 1);
+	if (f->error) {
+		free(f);
+		f = NULL;
 	}
-
-	return ff;
+	return f;
 }
 
-int32_t mp4ff_meta_get_num_items(const mp4ff_t * f)
+int32_t mp4_meta_get_num_items(const struct mp4 *f)
 {
 	return f->tags.count;
 }
 
-int32_t mp4ff_meta_get_by_index(const mp4ff_t * f, uint32_t index,
+int32_t mp4_meta_get_by_index(const struct mp4 *f, uint32_t index,
 				char **item, char **value)
 {
 	if (index >= f->tags.count) {
@@ -1419,7 +1232,7 @@ int32_t mp4ff_meta_get_by_index(const mp4ff_t * f, uint32_t index,
 	}
 }
 
-static uint32_t find_atom(mp4ff_t * f, uint64_t base, uint32_t size,
+static uint32_t find_atom(struct mp4 *f, uint64_t base, uint32_t size,
 			  const char *name)
 {
 	uint32_t remaining = size;
@@ -1448,7 +1261,7 @@ static uint32_t find_atom(mp4ff_t * f, uint64_t base, uint32_t size,
 	return 0;
 }
 
-static uint32_t find_atom_v2(mp4ff_t * f, uint64_t base, uint32_t size,
+static uint32_t find_atom_v2(struct mp4 *f, uint64_t base, uint32_t size,
 		const char *name, uint32_t extraheaders, const char *name_inside)
 {
 	uint64_t first_base = (uint64_t) (-1);
@@ -1484,20 +1297,18 @@ static uint32_t find_atom_v2(mp4ff_t * f, uint64_t base, uint32_t size,
 		return 0;
 }
 
-typedef struct {
+struct membuffer {
 	void *data;
 	unsigned written;
 	unsigned allocated;
 	unsigned error;
-} membuffer;
-
-#define stricmp strcasecmp
+};
 
-static membuffer *membuffer_create(void)
+static struct membuffer *membuffer_create(void)
 {
 	const unsigned initial_size = 256;
 
-	membuffer *buf = para_malloc(sizeof (membuffer));
+	struct membuffer *buf = para_malloc(sizeof(*buf));
 	buf->data = para_malloc(initial_size);
 	buf->written = 0;
 	buf->allocated = initial_size;
@@ -1506,7 +1317,7 @@ static membuffer *membuffer_create(void)
 	return buf;
 }
 
-static unsigned membuffer_write(membuffer * buf, const void *ptr, unsigned bytes)
+static unsigned membuffer_write(struct membuffer *buf, const void *ptr, unsigned bytes)
 {
 	unsigned dest_size = buf->written + bytes;
 
@@ -1516,17 +1327,7 @@ static unsigned membuffer_write(membuffer * buf, const void *ptr, unsigned bytes
 		do {
 			buf->allocated <<= 1;
 		} while (dest_size > buf->allocated);
-
-		{
-			void *newptr = realloc(buf->data, buf->allocated);
-			if (newptr == 0) {
-				free(buf->data);
-				buf->data = 0;
-				buf->error = 1;
-				return 0;
-			}
-			buf->data = newptr;
-		}
+		buf->data = para_realloc(buf->data, buf->allocated);
 	}
 
 	if (ptr)
@@ -1535,12 +1336,12 @@ static unsigned membuffer_write(membuffer * buf, const void *ptr, unsigned bytes
 	return bytes;
 }
 
-static unsigned membuffer_write_atom_name(membuffer * buf, const char *data)
+static unsigned membuffer_write_atom_name(struct membuffer *buf, const char *data)
 {
 	return membuffer_write(buf, data, 4) == 4 ? 1 : 0;
 }
 
-static unsigned membuffer_write_int16(membuffer * buf, uint16_t data)
+static unsigned membuffer_write_int16(struct membuffer *buf, uint16_t data)
 {
 	uint8_t temp[2];
 
@@ -1548,14 +1349,14 @@ static unsigned membuffer_write_int16(membuffer * buf, uint16_t data)
 	return membuffer_write(buf, temp, 2);
 }
 
-static unsigned membuffer_write_int32(membuffer * buf, uint32_t data)
+static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
 {
 	uint8_t temp[4];
 	write_u32_be(temp, data);
 	return membuffer_write(buf, temp, 4);
 }
 
-static void membuffer_write_track_tag(membuffer * buf, const char *name,
+static void membuffer_write_track_tag(struct membuffer *buf, const char *name,
 		uint32_t index, uint32_t total)
 {
 	membuffer_write_int32(buf,
@@ -1574,7 +1375,7 @@ static void membuffer_write_track_tag(membuffer * buf, const char *name,
 	membuffer_write_int16(buf, 0);
 }
 
-static void membuffer_write_int16_tag(membuffer * buf, const char *name,
+static void membuffer_write_int16_tag(struct membuffer *buf, const char *name,
 		uint16_t value)
 {
 	membuffer_write_int32(buf,
@@ -1599,18 +1400,18 @@ static uint32_t meta_genre_to_index(const char *genrestr)
 {
 	unsigned n;
 	for (n = 0; n < sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0]); n++) {
-		if (!stricmp(genrestr, ID3v1GenreList[n]))
+		if (!strcasecmp(genrestr, ID3v1GenreList[n]))
 			return n + 1;
 	}
 	return 0;
 }
 
-typedef struct {
+struct stdmeta_entry {
 	const char *atom;
 	const char *name;
-} stdmeta_entry;
+};
 
-static stdmeta_entry stdmetas[] = {
+struct stdmeta_entry stdmetas[] = {
 	{"\xA9" "nam", "title"},
 	{"\xA9" "ART", "artist"},
 	{"\xA9" "wrt", "writer"},
@@ -1627,13 +1428,13 @@ static const char *find_standard_meta(const char *name)	//returns atom name if f
 {
 	unsigned n;
 	for (n = 0; n < sizeof (stdmetas) / sizeof (stdmetas[0]); n++) {
-		if (!stricmp(name, stdmetas[n].name))
+		if (!strcasecmp(name, stdmetas[n].name))
 			return stdmetas[n].atom;
 	}
 	return 0;
 }
 
-static void membuffer_write_std_tag(membuffer * buf, const char *name,
+static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
 		const char *value)
 {
 	uint32_t flags = 1;
@@ -1656,7 +1457,7 @@ static void membuffer_write_std_tag(membuffer * buf, const char *name,
 	membuffer_write(buf, value, strlen(value));
 }
 
-static void membuffer_write_custom_tag(membuffer * buf, const char *name,
+static void membuffer_write_custom_tag(struct membuffer *buf, const char *name,
 		const char *value)
 {
 	membuffer_write_int32(buf,
@@ -1682,118 +1483,104 @@ static void membuffer_write_custom_tag(membuffer * buf, const char *name,
 	membuffer_write(buf, value, strlen(value));
 }
 
-static unsigned membuffer_error(const membuffer * buf)
+static unsigned membuffer_error(const struct membuffer *buf)
 {
 	return buf->error;
 }
 
-static void membuffer_free(membuffer * buf)
+static void membuffer_free(struct membuffer *buf)
 {
 	free(buf->data);
 	free(buf);
 }
 
-static unsigned membuffer_get_size(const membuffer * buf)
+static unsigned membuffer_get_size(const struct membuffer *buf)
 {
 	return buf->written;
 }
 
-static void *membuffer_detach(membuffer * buf)
+static void *membuffer_detach(struct membuffer *buf)
 {
 	void *ret;
 
 	if (buf->error)
 		return 0;
-
-	ret = realloc(buf->data, buf->written);
-
-	if (ret == 0)
-		free(buf->data);
-
+	ret = para_realloc(buf->data, buf->written);
 	buf->data = 0;
 	buf->error = 1;
-
 	return ret;
 }
 
-static uint32_t create_ilst(const mp4ff_metadata_t * data, void **out_buffer,
+static uint32_t create_ilst(const struct mp4_metadata *data, void **out_buffer,
 		uint32_t * out_size)
 {
-	membuffer *buf = membuffer_create();
+	struct membuffer *buf = membuffer_create();
 	unsigned metaptr;
 	char *mask = para_calloc(data->count);
-	{
-		const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
-		const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
-		const char *genre_ptr = 0, *tempo_ptr = 0;
-		for (metaptr = 0; metaptr < data->count; metaptr++) {
-			mp4ff_tag_t *tag = &data->tags[metaptr];
-			if (!stricmp(tag->item, "tracknumber") || !stricmp(tag->item, "track")) {
-				if (tracknumber_ptr == 0)
-					tracknumber_ptr = tag->value;
-				mask[metaptr] = 1;
-			} else if (!stricmp(tag->item, "totaltracks")) {
-				if (totaltracks_ptr == 0)
-					totaltracks_ptr = tag->value;
-				mask[metaptr] = 1;
-			} else if (!stricmp(tag->item, "discnumber")
-					|| !stricmp(tag->item, "disc")) {
-				if (discnumber_ptr == 0)
-					discnumber_ptr = tag->value;
-				mask[metaptr] = 1;
-			} else if (!stricmp(tag->item, "totaldiscs")) {
-				if (totaldiscs_ptr == 0)
-					totaldiscs_ptr = tag->value;
-				mask[metaptr] = 1;
-			} else if (!stricmp(tag->item, "genre")) {
-				if (genre_ptr == 0)
-					genre_ptr = tag->value;
-				mask[metaptr] = 1;
-			} else if (!stricmp(tag->item, "tempo")) {
-				if (tempo_ptr == 0)
-					tempo_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-
-		}
+	const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
+	const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
+	const char *genre_ptr = 0, *tempo_ptr = 0;
 
-		if (tracknumber_ptr)
-			membuffer_write_track_tag(buf, "trkn",
-						  myatoi(tracknumber_ptr),
-						  myatoi(totaltracks_ptr));
-		if (discnumber_ptr)
-			membuffer_write_track_tag(buf, "disk",
-						  myatoi(discnumber_ptr),
-						  myatoi(totaldiscs_ptr));
-		if (tempo_ptr)
-			membuffer_write_int16_tag(buf, "tmpo",
-						  (uint16_t) myatoi(tempo_ptr));
-
-		if (genre_ptr) {
-			uint32_t index = meta_genre_to_index(genre_ptr);
-			if (index == 0)
-				membuffer_write_std_tag(buf, "©gen",
-							genre_ptr);
-			else
-				membuffer_write_int16_tag(buf, "gnre",
-							  (uint16_t) index);
+	for (metaptr = 0; metaptr < data->count; metaptr++) {
+		struct mp4_tag *tag = &data->tags[metaptr];
+		if (!strcasecmp(tag->item, "tracknumber")
+				|| !strcasecmp(tag->item, "track")) {
+			if (tracknumber_ptr == 0)
+				tracknumber_ptr = tag->value;
+			mask[metaptr] = 1;
+		} else if (!strcasecmp(tag->item, "totaltracks")) {
+			if (totaltracks_ptr == 0)
+				totaltracks_ptr = tag->value;
+			mask[metaptr] = 1;
+		} else if (!strcasecmp(tag->item, "discnumber")
+				|| !strcasecmp(tag->item, "disc")) {
+			if (discnumber_ptr == 0)
+				discnumber_ptr = tag->value;
+			mask[metaptr] = 1;
+		} else if (!strcasecmp(tag->item, "totaldiscs")) {
+			if (totaldiscs_ptr == 0)
+				totaldiscs_ptr = tag->value;
+			mask[metaptr] = 1;
+		} else if (!strcasecmp(tag->item, "genre")) {
+			if (genre_ptr == 0)
+				genre_ptr = tag->value;
+			mask[metaptr] = 1;
+		} else if (!strcasecmp(tag->item, "tempo")) {
+			if (tempo_ptr == 0)
+				tempo_ptr = tag->value;
+			mask[metaptr] = 1;
 		}
 	}
 
-	for (metaptr = 0; metaptr < data->count; metaptr++) {
-		if (!mask[metaptr]) {
-			mp4ff_tag_t *tag = &data->tags[metaptr];
-			const char *std_meta_atom = find_standard_meta(tag->item);
-			if (std_meta_atom) {
-				membuffer_write_std_tag(buf, std_meta_atom,
-							tag->value);
-			} else {
-				membuffer_write_custom_tag(buf, tag->item,
-					tag->value);
-			}
-		}
+	if (tracknumber_ptr)
+		membuffer_write_track_tag(buf, "trkn", myatoi(tracknumber_ptr),
+			 myatoi(totaltracks_ptr));
+	if (discnumber_ptr)
+		membuffer_write_track_tag(buf, "disk", myatoi(discnumber_ptr),
+			 myatoi(totaldiscs_ptr));
+	if (tempo_ptr)
+		membuffer_write_int16_tag(buf, "tmpo", myatoi(tempo_ptr));
+
+	if (genre_ptr) {
+		uint32_t index = meta_genre_to_index(genre_ptr);
+		if (index == 0)
+			membuffer_write_std_tag(buf, "©gen", genre_ptr);
+		else
+			membuffer_write_int16_tag(buf, "gnre", index);
 	}
+	for (metaptr = 0; metaptr < data->count; metaptr++) {
+		struct mp4_tag *tag;
+		const char *std_meta_atom;
 
+		if (mask[metaptr])
+			continue;
+		tag = &data->tags[metaptr];
+		std_meta_atom = find_standard_meta(tag->item);
+		if (std_meta_atom)
+			membuffer_write_std_tag(buf, std_meta_atom, tag->value);
+		else
+			membuffer_write_custom_tag(buf, tag->item, tag->value);
+	}
 	free(mask);
 
 	if (membuffer_error(buf)) {
@@ -1808,7 +1595,7 @@ static uint32_t create_ilst(const mp4ff_metadata_t * data, void **out_buffer,
 	return 1;
 }
 
-static void membuffer_write_atom(membuffer * buf, const char *name, unsigned size,
+static void membuffer_write_atom(struct membuffer *buf, const char *name, unsigned size,
 			  const void *data)
 {
 	membuffer_write_int32(buf, size + 8);
@@ -1816,17 +1603,17 @@ static void membuffer_write_atom(membuffer * buf, const char *name, unsigned siz
 	membuffer_write(buf, data, size);
 }
 
-static void *membuffer_get_ptr(const membuffer * buf)
+static void *membuffer_get_ptr(const struct membuffer *buf)
 {
 	return buf->data;
 }
 
-static void membuffer_set_error(membuffer * buf)
+static void membuffer_set_error(struct membuffer *buf)
 {
 	buf->error = 1;
 }
 
-static unsigned membuffer_transfer_from_file(membuffer * buf, mp4ff_t * src,
+static unsigned membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
 		unsigned bytes)
 {
 	unsigned oldsize;
@@ -1849,10 +1636,10 @@ static unsigned membuffer_transfer_from_file(membuffer * buf, mp4ff_t * src,
 	return bytes;
 }
 
-static uint32_t create_meta(const mp4ff_metadata_t * data, void **out_buffer,
+static uint32_t create_meta(const struct mp4_metadata *data, void **out_buffer,
 		uint32_t * out_size)
 {
-	membuffer *buf;
+	struct membuffer *buf;
 	uint32_t ilst_size;
 	void *ilst_buffer;
 
@@ -1871,10 +1658,10 @@ static uint32_t create_meta(const mp4ff_metadata_t * data, void **out_buffer,
 	return 1;
 }
 
-static uint32_t create_udta(const mp4ff_metadata_t * data, void **out_buffer,
+static uint32_t create_udta(const struct mp4_metadata *data, void **out_buffer,
 uint32_t * out_size)
 {
-	membuffer *buf;
+	struct membuffer *buf;
 	uint32_t meta_size;
 	void *meta_buffer;
 
@@ -1898,7 +1685,7 @@ static uint32_t fix_byte_order_32(uint32_t src)
 	return read_u32_be(&src);
 }
 
-static uint32_t modify_moov(mp4ff_t * f, const mp4ff_metadata_t * data,
+static uint32_t modify_moov(struct mp4 *f, const struct mp4_metadata *data,
 		void **out_buffer, uint32_t * out_size)
 {
 	uint64_t total_base = f->moov_offset + 8;
@@ -1914,7 +1701,7 @@ static uint32_t modify_moov(mp4ff_t * f, const mp4ff_metadata_t * data,
 	int32_t size_delta;
 
 	if (!find_atom_v2(f, total_base, total_size, "udta", 0, "meta")) {
-		membuffer *buf;
+		struct membuffer *buf;
 		void *new_udta_buffer;
 		uint32_t new_udta_size;
 		if (!create_udta(data, &new_udta_buffer, &new_udta_size))
@@ -1937,7 +1724,7 @@ static uint32_t modify_moov(mp4ff_t * f, const mp4ff_metadata_t * data,
 		udta_offset = get_position(f);
 		udta_size = read_int32(f);
 		if (!find_atom_v2 (f, udta_offset + 8, udta_size - 8, "meta", 4, "ilst")) {
-			membuffer *buf;
+			struct membuffer *buf;
 			void *new_meta_buffer;
 			uint32_t new_meta_size;
 			if (!create_meta(data, &new_meta_buffer, &new_meta_size))
@@ -2012,79 +1799,71 @@ static uint32_t modify_moov(mp4ff_t * f, const mp4ff_metadata_t * data,
 	return 1;
 }
 
-static int32_t write_data(mp4ff_t * f, void *data, uint32_t size)
+static int32_t write_data(struct mp4 *f, void *data, uint32_t size)
 {
 	int32_t result = 1;
 
-	result = f->stream->write(f->stream->user_data, data, size);
+	result = f->cb->write(f->cb->user_data, data, size);
 
 	f->current_position += size;
 
 	return result;
 }
 
-static int32_t write_int32(mp4ff_t * f, const uint32_t data)
+static int32_t write_int32(struct mp4 *f, uint32_t data)
 {
 	int8_t temp[4];
 	write_u32_be(temp, data);
 	return write_data(f, temp, sizeof(temp));
 }
 
-static int32_t truncate_stream(mp4ff_t * f)
-{
-	return f->stream->truncate(f->stream->user_data);
-}
-
-int32_t mp4ff_meta_update(mp4ff_callback_t * f, const mp4ff_metadata_t * data)
+int32_t mp4_meta_update(const struct mp4_callback *cb,
+		const struct mp4_metadata *data)
 {
 	void *new_moov_data;
 	uint32_t new_moov_size;
 
-	mp4ff_t *ff = para_calloc(sizeof(mp4ff_t));
-	ff->stream = f;
-	set_position(ff, 0);
-
-	parse_atoms(ff, 1);
-
-	if (!modify_moov(ff, data, &new_moov_data, &new_moov_size)) {
-		mp4ff_close(ff);
+	struct mp4 *f = para_calloc(sizeof(struct mp4));
+	f->cb = cb;
+	set_position(f, 0);
+	parse_atoms(f, 1);
+	if (!modify_moov(f, data, &new_moov_data, &new_moov_size)) {
+		mp4_close(f);
 		return 0;
 	}
 
 	/* copy moov atom to end of the file */
-	if (ff->last_atom != ATOM_MOOV) {
+	if (f->last_atom != ATOM_MOOV) {
 		char *free_data = "free";
 
 		/* rename old moov to free */
-		set_position(ff, ff->moov_offset + 4);
-		write_data(ff, free_data, 4);
+		set_position(f, f->moov_offset + 4);
+		write_data(f, free_data, 4);
 
-		set_position(ff, ff->file_size);
-		write_int32(ff, new_moov_size + 8);
-		write_data(ff, "moov", 4);
-		write_data(ff, new_moov_data, new_moov_size);
+		set_position(f, f->file_size);
+		write_int32(f, new_moov_size + 8);
+		write_data(f, "moov", 4);
+		write_data(f, new_moov_data, new_moov_size);
 	} else {
-		set_position(ff, ff->moov_offset);
-		write_int32(ff, new_moov_size + 8);
-		write_data(ff, "moov", 4);
-		write_data(ff, new_moov_data, new_moov_size);
+		set_position(f, f->moov_offset);
+		write_int32(f, new_moov_size + 8);
+		write_data(f, "moov", 4);
+		write_data(f, new_moov_data, new_moov_size);
 	}
-
-	truncate_stream(ff);
-
-	mp4ff_close(ff);
+	cb->truncate(cb->user_data);
+	mp4_close(f);
 	return 1;
 }
 
 /* find a metadata item by name */
 /* returns 0 if item found, 1 if no such item */
-static int32_t meta_find_by_name(const mp4ff_t * f, const char *item,
+static int32_t meta_find_by_name(const struct mp4 *f, const char *item,
 		char **value)
 {
 	uint32_t i;
 
 	for (i = 0; i < f->tags.count; i++) {
-		if (!stricmp(f->tags.tags[i].item, item)) {
+		if (!strcasecmp(f->tags.tags[i].item, item)) {
 			*value = para_strdup(f->tags.tags[i].value);
 			return 1;
 		}
@@ -2096,27 +1875,27 @@ static int32_t meta_find_by_name(const mp4ff_t * f, const char *item,
 	return 0;
 }
 
-int32_t mp4ff_meta_get_artist(const mp4ff_t * f, char **value)
+int32_t mp4_meta_get_artist(const struct mp4 *f, char **value)
 {
 	return meta_find_by_name(f, "artist", value);
 }
 
-int32_t mp4ff_meta_get_title(const mp4ff_t * f, char **value)
+int32_t mp4_meta_get_title(const struct mp4 *f, char **value)
 {
 	return meta_find_by_name(f, "title", value);
 }
 
-int32_t mp4ff_meta_get_date(const mp4ff_t * f, char **value)
+int32_t mp4_meta_get_date(const struct mp4 *f, char **value)
 {
 	return meta_find_by_name(f, "date", value);
 }
 
-int32_t mp4ff_meta_get_album(const mp4ff_t * f, char **value)
+int32_t mp4_meta_get_album(const struct mp4 *f, char **value)
 {
 	return meta_find_by_name(f, "album", value);
 }
 
-int32_t mp4ff_meta_get_comment(const mp4ff_t * f, char **value)
+int32_t mp4_meta_get_comment(const struct mp4 *f, char **value)
 {
 	return meta_find_by_name(f, "comment", value);
 }