X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=9ea65d07e7d1823b3039739102ec5a05797df3f9;hb=a23c7f2c797ac29ed76db5059b00e3b8e5e2042a;hp=1158a381f9b54f3a175ca9f55d5c5c620b15e63b;hpb=e46bcc81f2eaa35e9409dd96fdbcc15647919b96;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index 1158a381..9ea65d07 100644
--- a/mp4.c
+++ b/mp4.c
@@ -62,7 +62,7 @@ struct mp4 {
 	struct mp4_track *track[MAX_TRACKS];
 
 	/* metadata */
-	struct mp4_metadata tags;
+	struct mp4_metadata meta;
 };
 
 int32_t mp4_total_tracks(const struct mp4 *f)
@@ -596,55 +596,24 @@ static int32_t read_stsd(struct mp4 *f)
 	return 0;
 }
 
-static int32_t tag_add_field(struct mp4_metadata *tags, const char *item,
+static int32_t tag_add_field(struct mp4_metadata *meta, const char *item,
 		const char *value, int32_t len)
 {
-	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;
+	meta->tags = para_realloc(meta->tags,
+		(meta->count + 1) * sizeof(struct mp4_tag));
+	meta->tags[meta->count].item = para_strdup(item);
+	meta->tags[meta->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;
+		meta->tags[meta->count].value = para_malloc(len + 1);
+		memcpy(meta->tags[meta->count].value, value, len);
+		meta->tags[meta->count].value[len] = 0;
 	} else {
-		tags->tags[tags->count].value = para_strdup(value);
+		meta->tags[meta->count].value = para_strdup(value);
 	}
-	tags->count++;
+	meta->count++;
 	return 1;
 }
 
-static const char *ID3v1GenreList[] = {
-	"Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk",
-	"Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies",
-	"Other", "Pop", "R&B", "Rap", "Reggae", "Rock",
-	"Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks",
-	"Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal",
-	"Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid",
-	"House", "Game", "Sound Clip", "Gospel", "Noise", "AlternRock", "Bass",
-	"Soul", "Punk", "Space", "Meditative", "Instrumental Pop",
-	"Instrumental Rock", "Ethnic", "Gothic", "Darkwave",
-	"Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance", "Dream",
-	"Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40",
-	"Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
-	"New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
-	"Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
-	"Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk",
-	"Swing", "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic",
-	"Bluegrass", "Avantgarde", "Gothic Rock", "Progressive Rock",
-	"Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band",
-	"Chorus", "Easy Listening", "Acoustic", "Humour", "Speech", "Chanson",
-	"Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus",
-	"Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba",
-	"Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle",
-	"Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House",
-	"Dance Hall", "Goa", "Drum & Bass", "Club House", "Hardcore", "Terror",
-	"Indie", "BritPop", "NegerPunk", "Polsk Punk", "Beat",
-	"Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover",
-	"Contemporary C", "Christian Rock", "Merengue", "Salsa", "Thrash Metal",
-	"Anime", "JPop", "SynthPop",
-};
-
 static char *read_string(struct mp4 *f, uint32_t length)
 {
 	char *str = para_malloc(length + 1);
@@ -695,7 +664,7 @@ static void parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 	}
 	if (!data)
 		return;
-	tag_add_field(&f->tags, get_metadata_name(parent), data, len);
+	tag_add_field(&f->meta, get_metadata_name(parent), data, len);
 	free(data);
 }
 
@@ -892,17 +861,17 @@ struct mp4 *mp4_open_read(const struct mp4_callback *cb)
 	return f;
 }
 
-static int32_t tag_delete(struct mp4_metadata *tags)
+static int32_t tag_delete(struct mp4_metadata *meta)
 {
 	uint32_t i;
 
-	for (i = 0; i < tags->count; i++) {
-		free(tags->tags[i].item);
-		free(tags->tags[i].value);
+	for (i = 0; i < meta->count; i++) {
+		free(meta->tags[i].item);
+		free(meta->tags[i].value);
 	}
-	free(tags->tags);
-	tags->tags = NULL;
-	tags->count = 0;
+	free(meta->tags);
+	meta->tags = NULL;
+	meta->count = 0;
 
 	return 0;
 }
@@ -924,7 +893,7 @@ void mp4_close(struct mp4 *f)
 		}
 	}
 
-	tag_delete(&(f->tags));
+	tag_delete(&(f->meta));
 	free(f);
 }
 
@@ -1115,7 +1084,7 @@ struct mp4 *mp4_open_meta(const struct mp4_callback *cb)
  */
 struct mp4_metadata *mp4_get_meta(struct mp4 *f)
 {
-	return &f->tags;
+	return &f->meta;
 }
 
 static uint32_t find_atom(struct mp4 *f, uint64_t base, uint32_t size,
@@ -1227,14 +1196,6 @@ static unsigned membuffer_write_atom_name(struct membuffer *buf, const char *dat
 	return membuffer_write(buf, data, 4) == 4 ? 1 : 0;
 }
 
-static unsigned membuffer_write_int16(struct membuffer *buf, uint16_t data)
-{
-	uint8_t temp[2];
-
-	write_u16_be(temp, data);
-	return membuffer_write(buf, temp, 2);
-}
-
 static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
 {
 	uint8_t temp[4];
@@ -1242,131 +1203,22 @@ static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
 	return membuffer_write(buf, temp, 4);
 }
 
-static void membuffer_write_track_tag(struct membuffer *buf, const char *name,
-		uint32_t index, uint32_t total)
-{
-	membuffer_write_int32(buf,
-		8 /*atom header */  + 8 /*data atom header */  +
-		8 /*flags + reserved */  + 8 /*actual data */ );
-	membuffer_write_atom_name(buf, name);
-	membuffer_write_int32(buf,
-		8 /*data atom header */  +
-		8 /*flags + reserved */  + 8 /*actual data */ );
-	membuffer_write_atom_name(buf, "data");
-	membuffer_write_int32(buf, 0);	//flags
-	membuffer_write_int32(buf, 0);	//reserved
-	membuffer_write_int16(buf, 0);
-	membuffer_write_int16(buf, (uint16_t) index);	//track number
-	membuffer_write_int16(buf, (uint16_t) total);	//total tracks
-	membuffer_write_int16(buf, 0);
-}
-
-static void membuffer_write_int16_tag(struct membuffer *buf, const char *name,
-		uint16_t value)
-{
-	membuffer_write_int32(buf,
-		8 /*atom header */  + 8 /*data atom header */  +
-		8 /*flags + reserved */  + 2 /*actual data */ );
-	membuffer_write_atom_name(buf, name);
-	membuffer_write_int32(buf,
-		8 /*data atom header */  +
-		8 /*flags + reserved */  + 2 /*actual data */ );
-	membuffer_write_atom_name(buf, "data");
-	membuffer_write_int32(buf, 0);	//flags
-	membuffer_write_int32(buf, 0);	//reserved
-	membuffer_write_int16(buf, value);	//value
-}
-
-static uint32_t myatoi(const char *param)
-{
-	return param ? atoi(param) : 0;
-}
-
-static uint32_t meta_genre_to_index(const char *genrestr)
-{
-	unsigned n;
-	for (n = 0; n < sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0]); n++) {
-		if (!strcasecmp(genrestr, ID3v1GenreList[n]))
-			return n + 1;
-	}
-	return 0;
-}
-
-struct stdmeta_entry {
-	const char *atom;
-	const char *name;
-};
-
-struct stdmeta_entry stdmetas[] = {
-	{"\xA9" "nam", "title"},
-	{"\xA9" "ART", "artist"},
-	{"\xA9" "wrt", "writer"},
-	{"\xA9" "alb", "album"},
-	{"\xA9" "day", "date"},
-	{"\xA9" "too", "tool"},
-	{"\xA9" "cmt", "comment"},
-	{"cpil", "compilation"},
-	{"covr", "cover"},
-	{"aART", "album_artist"},
-};
-
-static const char *find_standard_meta(const char *name)	//returns atom name if found, 0 if not
-{
-	unsigned n;
-	for (n = 0; n < sizeof (stdmetas) / sizeof (stdmetas[0]); n++) {
-		if (!strcasecmp(name, stdmetas[n].name))
-			return stdmetas[n].atom;
-	}
-	return 0;
-}
-
 static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
 		const char *value)
 {
-	uint32_t flags = 1;
-
-	/* special check for compilation flag */
-	if (strcmp(name, "cpil") == 0) {
-		flags = 21;
-	}
-
-	membuffer_write_int32(buf,
-		8 /*atom header */  + 8 /*data atom header */  +
-		8 /*flags + reserved */  + strlen(value));
+	uint32_t len = strlen(value);
+	membuffer_write_int32(buf, 8 /* atom header */
+		+ 8 /* data atom header */
+		+ 8 /* flags + reserved */
+		+ len);
 	membuffer_write_atom_name(buf, name);
-	membuffer_write_int32(buf,
-		8 /*data atom header */  +
-		8 /*flags + reserved */  + strlen(value));
+	membuffer_write_int32(buf, 8 /* data atom header */
+		+ 8 /* flags + reserved */
+		+ len);
 	membuffer_write_atom_name(buf, "data");
-	membuffer_write_int32(buf, flags);	//flags
-	membuffer_write_int32(buf, 0);	//reserved
-	membuffer_write(buf, value, strlen(value));
-}
-
-static void membuffer_write_custom_tag(struct membuffer *buf, const char *name,
-		const char *value)
-{
-	membuffer_write_int32(buf,
-		8 /*atom header */  +
-		0x1C /*weirdo itunes atom */  +
-		12 /*name atom header */  + strlen(name) +
-		16 /*data atom header + flags */  + strlen(value));
-	membuffer_write_atom_name(buf, "----");
-	membuffer_write_int32(buf, 0x1C);	//weirdo itunes atom
-	membuffer_write_atom_name(buf, "mean");
-	membuffer_write_int32(buf, 0);
-	membuffer_write(buf, "com.apple.iTunes", 16);
-	membuffer_write_int32(buf, 12 + strlen(name));
-	membuffer_write_atom_name(buf, "name");
-	membuffer_write_int32(buf, 0);
-	membuffer_write(buf, name, strlen(name));
-	membuffer_write_int32(buf,
-		8 /*data atom header */  +
-		8 /*flags + reserved */  + strlen(value));
-	membuffer_write_atom_name(buf, "data");
-	membuffer_write_int32(buf, 1);	//flags
-	membuffer_write_int32(buf, 0);	//reserved
-	membuffer_write(buf, value, strlen(value));
+	membuffer_write_int32(buf, 1);	/* flags */
+	membuffer_write_int32(buf, 0);	/* reserved */
+	membuffer_write(buf, value, len);
 }
 
 static unsigned membuffer_error(const struct membuffer *buf)
@@ -1397,78 +1249,41 @@ static void *membuffer_detach(struct membuffer *buf)
 	return ret;
 }
 
-static uint32_t create_ilst(const struct mp4_metadata *data, void **out_buffer,
+struct stdmeta_entry {
+	const char *atom;
+	const char *name;
+};
+
+static const char *find_standard_meta(const char *name)
+{
+	const struct stdmeta_entry stdmetas[] = {
+		{"\xA9" "nam", "title"},
+		{"\xA9" "ART", "artist"},
+		{"\xA9" "alb", "album"},
+		{"\xA9" "day", "date"},
+		{"\xA9" "cmt", "comment"},
+	};
+
+	for (unsigned n = 0; n < ARRAY_SIZE(stdmetas); n++)
+		if (!strcasecmp(name, stdmetas[n].name))
+			return stdmetas[n].atom;
+	return NULL;
+}
+
+static uint32_t create_ilst(const struct mp4_metadata *meta, void **out_buffer,
 		uint32_t * out_size)
 {
 	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++) {
-		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;
-		}
-	}
-
-	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);
+	for (metaptr = 0; metaptr < meta->count; metaptr++) {
+		struct mp4_tag *tag = meta->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);
+			PARA_ERROR_LOG("invalid tag item: %s\n", tag->item);
 	}
-	free(mask);
-
 	if (membuffer_error(buf)) {
 		membuffer_free(buf);
 		return 0;
@@ -1522,14 +1337,14 @@ static unsigned membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *
 	return bytes;
 }
 
-static uint32_t create_meta(const struct mp4_metadata *data, void **out_buffer,
+static uint32_t create_meta(const struct mp4_metadata *meta, void **out_buffer,
 		uint32_t * out_size)
 {
 	struct membuffer *buf;
 	uint32_t ilst_size;
 	void *ilst_buffer;
 
-	if (!create_ilst(data, &ilst_buffer, &ilst_size))
+	if (!create_ilst(meta, &ilst_buffer, &ilst_size))
 		return 0;
 
 	buf = membuffer_create();
@@ -1544,14 +1359,14 @@ static uint32_t create_meta(const struct mp4_metadata *data, void **out_buffer,
 	return 1;
 }
 
-static uint32_t create_udta(const struct mp4_metadata *data, void **out_buffer,
+static uint32_t create_udta(const struct mp4_metadata *meta, void **out_buffer,
 uint32_t * out_size)
 {
 	struct membuffer *buf;
 	uint32_t meta_size;
 	void *meta_buffer;
 
-	if (!create_meta(data, &meta_buffer, &meta_size))
+	if (!create_meta(meta, &meta_buffer, &meta_size))
 		return 0;
 
 	buf = membuffer_create();
@@ -1590,7 +1405,7 @@ static uint32_t modify_moov(struct mp4 *f, void **out_buffer,
 		struct membuffer *buf;
 		void *new_udta_buffer;
 		uint32_t new_udta_size;
-		if (!create_udta(&f->tags, &new_udta_buffer, &new_udta_size))
+		if (!create_udta(&f->meta, &new_udta_buffer, &new_udta_size))
 			return 0;
 
 		buf = membuffer_create();
@@ -1614,7 +1429,7 @@ static uint32_t modify_moov(struct mp4 *f, void **out_buffer,
 			void *new_meta_buffer;
 			uint32_t new_meta_size;
 
-			if (!create_meta(&f->tags, &new_meta_buffer, &new_meta_size))
+			if (!create_meta(&f->meta, &new_meta_buffer, &new_meta_size))
 				return 0;
 
 			buf = membuffer_create();
@@ -1642,7 +1457,7 @@ static uint32_t modify_moov(struct mp4 *f, void **out_buffer,
 		ilst_offset = get_position(f);
 		ilst_size = read_int32(f);
 
-		if (!create_ilst(&f->tags, &new_ilst_buffer, &new_ilst_size))
+		if (!create_ilst(&f->meta, &new_ilst_buffer, &new_ilst_size))
 			return 0;
 
 		size_delta = new_ilst_size - (ilst_size - 8);
@@ -1741,9 +1556,9 @@ static char *meta_find_by_name(const struct mp4 *f, const char *item)
 {
 	uint32_t i;
 
-	for (i = 0; i < f->tags.count; i++)
-		if (!strcasecmp(f->tags.tags[i].item, item))
-			return para_strdup(f->tags.tags[i].value);
+	for (i = 0; i < f->meta.count; i++)
+		if (!strcasecmp(f->meta.tags[i].item, item))
+			return para_strdup(f->meta.tags[i].value);
 	return NULL;
 }