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

diff --git a/mp4.c b/mp4.c
index 7179958c..c97fa477 100644
--- a/mp4.c
+++ b/mp4.c
@@ -15,12 +15,8 @@
 struct mp4_track {
 	bool is_audio;
 	int32_t channelCount;
-	int32_t sampleSize;
 	uint16_t sampleRate;
 
-	/* stsd */
-	int32_t stsd_entry_count;
-
 	/* stsz */
 	int32_t stsz_sample_size;
 	int32_t stsz_sample_count;
@@ -41,14 +37,6 @@ struct mp4_track {
 	int32_t stco_entry_count;
 	int32_t *stco_chunk_offset;
 
-	/* ctts */
-	int32_t ctts_entry_count;
-	int32_t *ctts_sample_count;
-	int32_t *ctts_sample_offset;
-
-	uint32_t maxBitrate;
-	uint32_t avgBitrate;
-
 	uint32_t timeScale;
 	uint64_t duration;
 };
@@ -56,19 +44,16 @@ struct mp4_track {
 #define MAX_TRACKS 1024
 
 struct mp4 {
-	/* stream to read from */
-	struct mp4_callback *stream;
+	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 error;
 
-	/* mvhd */
-	int32_t time_scale;
-	int32_t duration;
+	uint32_t read_error;
+	uint32_t error;
 
 	/* incremental track index while reading the file */
 	int32_t total_tracks;
@@ -89,10 +74,10 @@ 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;
 
@@ -404,7 +389,7 @@ static int need_parse_when_meta_only(uint8_t atom_type)
 
 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;
@@ -460,7 +445,7 @@ static int32_t read_stsz(struct mp4 *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;
 }
@@ -485,41 +470,13 @@ static int32_t read_stts(struct mp4 *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(struct mp4 *f)
-{
-	int32_t i;
-	struct mp4_track *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(struct mp4 *f)
 {
 	int32_t i;
@@ -539,7 +496,7 @@ static int32_t read_stsc(struct mp4 *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);
@@ -562,7 +519,7 @@ static int32_t read_stco(struct mp4 *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;
 }
@@ -595,7 +552,7 @@ static int32_t read_mp4a(struct mp4 *f)
 	read_int32(f);	/* reserved */
 
 	t->channelCount = read_int16(f);
-	t->sampleSize = read_int16(f);
+	read_int16(f);
 
 	read_int16(f);
 	read_int16(f);
@@ -610,7 +567,7 @@ static int32_t read_mp4a(struct mp4 *f)
 
 static int32_t read_stsd(struct mp4 *f)
 {
-	int32_t i;
+	int32_t i, entry_count;
 	uint8_t header_size = 0;
 	struct mp4_track *t;
 
@@ -622,10 +579,10 @@ static int32_t read_stsd(struct mp4 *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;
@@ -640,32 +597,6 @@ static int32_t read_stsd(struct mp4 *f)
 	return 0;
 }
 
-static int32_t read_mvhd(struct mp4 *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(struct mp4_metadata *tags, const char *item,
 		const char *value, int32_t len)
 {
@@ -737,118 +668,41 @@ static char *read_string(struct mp4 *f, uint32_t length)
 	return str;
 }
 
-static int32_t set_metadata_name(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(uint8_t atom_type)
@@ -887,7 +741,7 @@ static int32_t parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 
 	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);
@@ -953,12 +807,10 @@ static int32_t parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 	}
 	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);
@@ -1046,9 +898,6 @@ static int32_t atom_read(struct mp4 *f, int32_t size, uint8_t atom_type)
 	} 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);
@@ -1058,9 +907,6 @@ static int32_t atom_read(struct mp4 *f, int32_t size, uint8_t atom_type)
 	} 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);
@@ -1115,7 +961,7 @@ static int32_t parse_atoms(struct mp4 *f, int meta_only)
 	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) {
@@ -1141,20 +987,17 @@ static int32_t parse_atoms(struct mp4 *f, int meta_only)
 	return 0;
 }
 
-struct mp4 *mp4_open_read(struct mp4_callback *f)
+struct mp4 *mp4_open_read(const struct mp4_callback *cb)
 {
-	struct mp4 *ff = para_calloc(sizeof(struct mp4));
-
-	ff->stream = f;
+	struct mp4 *f = para_calloc(sizeof(struct mp4));
 
-	parse_atoms(ff, 0);
-
-	if (ff->error) {
-		free(ff);
-		ff = NULL;
+	f->cb = cb;
+	parse_atoms(f, 0);
+	if (f->error) {
+		free(f);
+		f = NULL;
 	}
-
-	return ff;
+	return f;
 }
 
 static int32_t tag_delete(struct mp4_metadata *tags)
@@ -1172,27 +1015,25 @@ static int32_t tag_delete(struct mp4_metadata *tags)
 	return 0;
 }
 
-void mp4_close(struct mp4 *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]->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 struct mp4 *f, int32_t track,
@@ -1359,20 +1200,17 @@ int32_t mp4_num_samples(const struct mp4 *f, int32_t track)
 	return total;
 }
 
-struct mp4 *mp4_open_meta(struct mp4_callback *f)
+struct mp4 *mp4_open_meta(const struct mp4_callback *cb)
 {
-	struct mp4 *ff = para_calloc(sizeof(struct mp4));
+	struct mp4 *f = para_calloc(sizeof(struct mp4));
 
-	ff->stream = f;
-
-	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 mp4_meta_get_num_items(const struct mp4 *f)
@@ -1965,7 +1803,7 @@ 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;
 
@@ -1979,49 +1817,41 @@ static int32_t write_int32(struct mp4 *f, uint32_t data)
 	return write_data(f, temp, sizeof(temp));
 }
 
-static int32_t truncate_stream(struct mp4 *f)
-{
-	return f->stream->truncate(f->stream->user_data);
-}
-
-int32_t mp4_meta_update(struct mp4_callback *f, const struct mp4_metadata *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;
 
-	struct mp4 *ff = para_calloc(sizeof(struct mp4));
-	ff->stream = f;
-	set_position(ff, 0);
-
-	parse_atoms(ff, 1);
-
-	if (!modify_moov(ff, data, &new_moov_data, &new_moov_size)) {
-		mp4_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);
-
-	mp4_close(ff);
+	cb->truncate(cb->user_data);
+	mp4_close(f);
 	return 1;
 }