X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=2d18d5e5de7df641f6cbe7b7ad937cb3f2d69e3e;hp=f3f95d486daff1799d23d390557d68775a7135c7;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=8231c4db98e5278fde9678a5d16a68fbef777662

diff --git a/mp3_afh.c b/mp3_afh.c
index f3f95d48..2d18d5e5 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -71,6 +71,121 @@ static const int mp3info_bitrate[2][3][14] = {
 static const int frame_size_index[] = {24000, 72000, 72000};
 static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
 
+#ifdef HAVE_LIBID3TAG
+
+#include <id3tag.h>
+
+static char *get_latin1(id3_ucs4_t const *string)
+{
+	if (!string)
+		return NULL;
+	return (char *)id3_ucs4_latin1duplicate(string);
+}
+
+static char *get_stringlist(union id3_field *field)
+{
+	unsigned int k, nstrings = id3_field_getnstrings(field);
+	char *result = NULL;
+
+	for (k = 0; k < nstrings; k++) {
+		char *tmp = (char *)get_latin1(id3_field_getstrings(field, k));
+		if (result) {
+			char *tmp2 = result;
+			result = make_message("%s %s", tmp2, tmp);
+			free(tmp);
+			free(tmp2);
+		} else
+			result = tmp;
+	}
+	return result;
+}
+
+static char *get_string(union id3_field *field)
+{
+	id3_ucs4_t const *string = id3_field_getfullstring(field);
+
+	return get_latin1(string);
+}
+
+#define FOR_EACH_FIELD(f, j, fr) for (j = 0; j < (fr)->nfields && \
+	(f = id3_frame_field((fr), j)); j++)
+
+static char *get_strings(struct id3_frame *fr)
+{
+	int j;
+	union id3_field *field;
+
+	FOR_EACH_FIELD(field, j, fr) {
+		enum id3_field_type type = id3_field_type(field);
+
+		if (type == ID3_FIELD_TYPE_STRINGLIST)
+			return get_stringlist(field);
+		if (type == ID3_FIELD_TYPE_STRINGFULL)
+			return get_string(field);
+	}
+	return NULL;
+}
+
+static char *mp3_get_id3(__a_unused unsigned char *map,
+		__a_unused size_t numbytes, int fd)
+{
+	int i;
+	struct id3_tag *id3_t;
+	char *title = NULL, *artist = NULL, *album = NULL, *year = NULL,
+		*comment = NULL, *result;
+	struct id3_file *id3_f = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY);
+
+	if (!id3_f)
+		goto no_tag;
+	id3_t = id3_file_tag(id3_f);
+	if (!id3_t)
+		goto no_tag;
+	for (i = 0; i < id3_t->nframes; i++) {
+		struct id3_frame *fr = id3_t->frames[i];
+		if (!strcmp(fr->id, "TIT2")) {
+			if (!title)
+				title = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, "TPE1")) {
+			if (!artist)
+				artist = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, "TALB")) {
+			if (!album)
+				album = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, "TDRC")) {
+			if (!year)
+				year = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, "COMM")) {
+			if (!comment)
+				comment = get_strings(fr);
+			continue;
+		}
+	}
+	id3_file_close(id3_f);
+	result = make_taginfo(title, artist, album, year, comment);
+	free(title);
+	free(artist);
+	free(album);
+	free(year);
+	free(comment);
+	return result;
+no_tag:
+	if (id3_f)
+		id3_file_close(id3_f);
+	return make_message("%s: (no id3 v1/v2 tag)\n%s:\n",
+		status_item_list[SI_TAGINFO1],
+		status_item_list[SI_TAGINFO2]);
+}
+
+#else /* HAVE_LIBID3TAG */
+
 /*
  * Remove trailing whitespace from the end of a string
  */
@@ -82,7 +197,7 @@ static char *unpad(char *string)
 	return string;
 }
 
-static char *mp3_get_id3(unsigned char *map, size_t numbytes)
+static char *mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd)
 {
 	char title[31], artist[31], album[31], year[5], comment[31];
 	off_t fpos;
@@ -113,17 +228,9 @@ static char *mp3_get_id3(unsigned char *map, size_t numbytes)
 	unpad(album);
 	unpad(year);
 	unpad(comment);
-	return make_message("%s: %s, by %s\n" /* taginfo1 */
-		"%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
-		status_item_list[SI_TAGINFO1],
-		*title? title : "(title tag not set)",
-		*artist? artist : "(artist tag not set)",
-		status_item_list[SI_TAGINFO2],
-		*album?  album : "(album tag not set)",
-		*year? year : "????",
-		*comment? comment : "(comment tag not set)"
-	);
+	return make_taginfo(title, artist, album, year, comment);
 }
+#endif /* HAVE_LIBID3TAG */
 
 static int header_frequency(struct mp3header *h)
 {
@@ -173,7 +280,7 @@ static int frame_length(struct mp3header *header)
 
 static int compare_headers(struct mp3header *h1,struct mp3header *h2)
 {
-	if ((*(uint*)h1) == (*(uint*)h2))
+	if ((*(unsigned int*)h1) == (*(unsigned int*)h2))
 		return 1;
 	if ((h1->version == h2->version) &&
 			(h1->layer == h2->layer) &&
@@ -284,11 +391,11 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos,
 	return frame_len;
 }
 
-static int mp3_read_info(unsigned char *map, size_t numbytes,
+static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
 		struct afh_info *afhi)
 {
-	long freq_avg = 0, br_avg = 0;
-	int ret, len = 0, old_br = -1, vbr = 0;
+	uint64_t freq_sum = 0, br_sum = 0;
+	int fl = 0, ret, len = 0, old_br = -1, vbr = 0;
 	struct timeval total_time = {0, 0};
 	unsigned chunk_table_size = 1000; /* gets increased on demand */
 	off_t fpos = 0;
@@ -296,15 +403,23 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
 	char *taginfo;
 
 	afhi->chunks_total = 0;
-	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
-	taginfo = mp3_get_id3(map, numbytes);
+	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
+	taginfo = mp3_get_id3(map, numbytes, fd);
 	while (1) {
-		unsigned long freq, br, fl;
+		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
 		fpos += len;
 		len = find_valid_start(map, numbytes, &fpos, &header);
-		if (len <= 0)
+		if (len <= 0) {
+			size_t end;
+			ret = -E_MP3_INFO;
+			if (!afhi->chunks_total)
+				goto err_out;
+			end = afhi->chunk_table[afhi->chunks_total - 1] + fl;
+			afhi->chunk_table[afhi->chunks_total]
+				= PARA_MIN(end, numbytes);
 			break;
+		}
 		ret = header_frequency(&header);
 		if (ret < 0)
 			continue;
@@ -322,35 +437,24 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
 		tv_divide(br * 125, &tmp, &cct);
 		tv_add(&cct, &total_time, &tmp);
 		total_time = tmp;
-		//PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
 		if (afhi->chunks_total >= chunk_table_size) {
 			chunk_table_size *= 2;
 			afhi->chunk_table = para_realloc(afhi->chunk_table,
-				chunk_table_size * sizeof(size_t));
+				chunk_table_size * sizeof(uint32_t));
 		}
 		afhi->chunk_table[afhi->chunks_total] = fpos;
-//		if (afhi->chunks_total < 10 || !(afhi->chunks_total % 1000))
-//			PARA_INFO_LOG("chunk #%lu: %zd\n", afhi->chunks_total,
-//				afhi->chunk_table[afhi->chunks_total]);
 		afhi->chunks_total++;
-		if (afhi->chunks_total == 1) {
-			freq_avg = freq;
-			br_avg = br;
-			old_br = br;
-			continue;
-		}
-		freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1);
-		br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1);
-		if (old_br != br)
+		freq_sum += freq;
+		br_sum += br;
+		if (afhi->chunks_total != 1 && old_br != br)
 			vbr = 1;
 		old_br = br;
 	}
 	ret = -E_MP3_INFO;
-	if (!afhi->chunks_total || !freq_avg || !br_avg)
+	if (!freq_sum || !br_sum)
 		goto err_out;
-	afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
-	afhi->bitrate = br_avg;
-	afhi->frequency = freq_avg;
+	afhi->bitrate = br_sum / afhi->chunks_total;
+	afhi->frequency = freq_sum / afhi->chunks_total;
 	afhi->channels = header_channels(&header);
 	afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
 	tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
@@ -378,7 +482,7 @@ static int mp3_get_file_info(char *map, size_t numbytes, int fd,
 {
 	int ret;
 
-	ret = mp3_read_info((unsigned char *)map, numbytes, afhi);
+	ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi);
 	if (ret < 0)
 		return ret;
 	if (afhi->seconds_total < 2 || !afhi->chunks_total)