X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=2d18d5e5de7df641f6cbe7b7ad937cb3f2d69e3e;hp=0c8efbdc5a7c59b84d0b64ada3e7b8c648c833d4;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=2416ea6856cb36d064a079cc5e9674383c8b2eae;ds=sidebyside

diff --git a/mp3_afh.c b/mp3_afh.c
index 0c8efbdc..2d18d5e5 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2003-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2009 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file mp3_afh.c para_server's mp3 audio format handler */
@@ -28,12 +16,12 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
-#include "server.cmdline.h"
-#include "server.h"
-#include "vss.h"
+#include "para.h"
 #include "error.h"
-#include "fd.h"
+#include "afh.h"
 #include "string.h"
+#include "afs.h"
+#include "server.h"
 
 /** \cond some defines and structs which are only used in this file */
 
@@ -59,23 +47,6 @@ struct mp3header {
 	unsigned int emphasis;
 };
 
-struct id3tag {
-	char title[31];
-	char artist[31];
-	char album[31];
-	char year[5];
-	char comment[31];
-};
-
-struct mp3info {
-	struct mp3header header;
-	int id3_isvalid;
-	struct id3tag id3;
-	int vbr;
-	long unsigned br_average;
-	int freq;
-};
-
 /** \endcond */
 static const int frequencies[3][4] = {
 	{22050,24000,16000,50000}, /* MPEG 2.0 */
@@ -100,7 +71,166 @@ 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"};
 
-static struct mp3info mp3;
+#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
+ */
+static char *unpad(char *string)
+{
+	char *pos = string + strlen(string) - 1;
+	while (para_isspace(pos[0]))
+		(pos--)[0] = 0;
+	return string;
+}
+
+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;
+
+	if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) {
+		PARA_DEBUG_LOG("no id3 v1 tag\n");
+		return make_message("%s: (no id3 v1 tag)\n%s:\n",
+			status_item_list[SI_TAGINFO1],
+			status_item_list[SI_TAGINFO2]);
+	}
+	fpos = numbytes - 125;
+	memcpy(title, map + fpos, 30);
+	fpos += 30;
+	title[30] = '\0';
+	memcpy(artist, map + fpos, 30);
+	fpos += 30;
+	artist[30] = '\0';
+	memcpy(album, map + fpos, 30);
+	fpos += 30;
+	album[30] = '\0';
+	memcpy(year, map + fpos, 4);
+	fpos += 4;
+	year[4] = '\0';
+	memcpy(comment, map + fpos, 30);
+	comment[30] = '\0';
+	unpad(title);
+	unpad(artist);
+	unpad(album);
+	unpad(year);
+	unpad(comment);
+	return make_taginfo(title, artist, album, year, comment);
+}
+#endif /* HAVE_LIBID3TAG */
 
 static int header_frequency(struct mp3header *h)
 {
@@ -116,6 +246,15 @@ static const char *header_mode(struct mp3header *h)
 	return mode_text[h->mode];
 }
 
+static int header_channels(struct mp3header *h)
+{
+	if (h->mode > 3)
+		return 0;
+	if (h->mode < 3)
+		return 2;
+	return 1;
+}
+
 static int header_bitrate(struct mp3header *h)
 {
 	if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate)
@@ -139,42 +278,9 @@ static int frame_length(struct mp3header *header)
 		+ header->padding;
 }
 
-static void write_info_str(struct audio_format_info *afi)
-{
-	int v = mp3.id3_isvalid;
-
-	snprintf(afi->info_string, MMD_INFO_SIZE,
-		"audio_file_info1:%lu x %lums, %lu kbit/s (%cbr) %i KHz %s\n"
-		"audio_file_info2:%s, by %s\n"
-		"audio_file_info3:A: %s, Y: %s, C: %s\n",
-		afi->chunks_total,
-		tv2ms(&afi->chunk_tv),
-		mp3.br_average,
-		mp3.vbr? 'v' : 'c',
-		mp3.freq / 1000,
-		header_mode(&mp3.header),
-		v && *mp3.id3.title? mp3.id3.title : "(title tag not set)",
-		v && *mp3.id3.artist? mp3.id3.artist : "(artist tag not set)",
-		v && *mp3.id3.album? mp3.id3.album : "(album tag not set)",
-		v && *mp3.id3.year? mp3.id3.year : "????",
-		v && *mp3.id3.comment? mp3.id3.comment : "(comment tag not set)"
-	);
-}
-
-/*
- * Remove trailing whitespace from the end of a string
- */
-static char *unpad(char *string)
-{
-	char *pos = string + strlen(string) - 1;
-	while (isspace(pos[0]))
-		(pos--)[0] = 0;
-	return string;
-}
-
 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) &&
@@ -196,7 +302,7 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2)
  * retrieve a valid frame header, and a negative return value indicates an
  * error.
  */
-static int get_header(unsigned char *map, off_t numbytes, off_t *fpos,
+static int get_header(unsigned char *map, size_t numbytes, off_t *fpos,
 	struct mp3header *header)
 {
 	int fl, ret;
@@ -235,7 +341,8 @@ out:
  * Return the length of the next frame header or zero if the end of the file is
  * reached.
  */
-static int mp3_seek_next_header(unsigned char *map, off_t numbytes, off_t *fpos)
+static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos,
+	struct mp3header *result)
 {
 	int k, l = 0, first_len;
 	struct mp3header h, h2;
@@ -258,60 +365,23 @@ static int mp3_seek_next_header(unsigned char *map, off_t numbytes, off_t *fpos)
 		}
 		if (k == MIN_CONSEC_GOOD_FRAMES) {
 			*fpos = valid_start;
-			memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
+			*result = h2;
 			return first_len;
 		}
 	}
 	return 0;
 }
 
-static void mp3_get_id3(unsigned char *map, off_t numbytes, off_t *fpos)
-{
-	mp3.id3_isvalid = 0;
-	mp3.id3.title[0] = '\0';
-	mp3.id3.artist[0] = '\0';
-	mp3.id3.album[0] = '\0';
-	mp3.id3.comment[0] = '\0';
-	mp3.id3.year[0] = '\0';
-	if (numbytes < 128)
-		return;
-	*fpos = numbytes - 128;
-	if (strncmp("TAG", map + *fpos, 3)) {
-		PARA_INFO_LOG("%s", "no id3 tag\n");
-		return;
-	}
-	*fpos = numbytes - 125;
-	memcpy(mp3.id3.title, map + *fpos, 30);
-	*fpos += 30;
-	mp3.id3.title[30] = '\0';
-	memcpy(mp3.id3.artist, map + *fpos, 30);
-	*fpos += 30;
-	mp3.id3.artist[30] = '\0';
-	memcpy(mp3.id3.album, map + *fpos, 30);
-	*fpos += 30;
-	mp3.id3.album[30] = '\0';
-	memcpy(mp3.id3.year, map + *fpos, 4);
-	*fpos += 4;
-	mp3.id3.year[4] = '\0';
-	memcpy(mp3.id3.comment, map + *fpos, 30);
-	mp3.id3.comment[30] = '\0';
-	mp3.id3_isvalid = 1;
-	unpad(mp3.id3.title);
-	unpad(mp3.id3.artist);
-	unpad(mp3.id3.album);
-	unpad(mp3.id3.year);
-	unpad(mp3.id3.comment);
-}
-
-static int find_valid_start(unsigned char *map, off_t numbytes, off_t *fpos)
+static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos,
+	struct mp3header *header)
 {
 	int frame_len;
 
-	frame_len = get_header(map, numbytes, fpos, &mp3.header);
+	frame_len = get_header(map, numbytes, fpos, header);
 	if (frame_len < 0)
 		return frame_len;
 	if (!frame_len) {
-		frame_len = mp3_seek_next_header(map, numbytes, fpos);
+		frame_len = mp3_seek_next_header(map, numbytes, fpos, header);
 		if (frame_len <= 0)
 			return frame_len;
 	} else
@@ -321,95 +391,101 @@ static int find_valid_start(unsigned char *map, off_t numbytes, off_t *fpos)
 	return frame_len;
 }
 
-static int mp3_read_info(unsigned char *map, off_t numbytes,
-		struct audio_format_info *afi)
+static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
+		struct afh_info *afhi)
 {
-	long fl_avg = 0, freq_avg = 0, br_avg = 0;
-	int ret, len = 0, old_br = -1;
+	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;
+	struct mp3header header;
+	char *taginfo;
 
-	afi->chunks_total = 0;
-	afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
-	mp3_get_id3(map, numbytes, &fpos);
-	fpos = 0;
-	mp3.vbr = 0;
-	mp3.freq = 0;
+	afhi->chunks_total = 0;
+	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
+	taginfo = mp3_get_id3(map, numbytes, fd);
 	while (1) {
-		int freq, br, fl;
+		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
 		fpos += len;
-		len = find_valid_start(map, numbytes, &fpos);
-		if (len <= 0)
+		len = find_valid_start(map, numbytes, &fpos, &header);
+		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;
-		freq = header_frequency(&mp3.header);
-		br = header_bitrate(&mp3.header);
-		fl = frame_length(&mp3.header);
-		if (freq < 0 || br < 0 || fl < 0)
+		}
+		ret = header_frequency(&header);
+		if (ret < 0)
+			continue;
+		freq = ret;
+		ret = header_bitrate(&header);
+		if (ret < 0)
+			continue;
+		br = ret;
+		ret = frame_length(&header);
+		if (ret < 0)
 			continue;
+		fl = ret;
 		tmp.tv_sec = fl;
 		tmp.tv_usec = 0;
 		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 (afi->chunks_total >= chunk_table_size) {
+		if (afhi->chunks_total >= chunk_table_size) {
 			chunk_table_size *= 2;
-			afi->chunk_table = para_realloc(afi->chunk_table,
-				chunk_table_size * sizeof(size_t));
-		}
-		afi->chunk_table[afi->chunks_total] = fpos;
-//		if (afi->chunks_total < 10 || !(afi->chunks_total % 1000))
-//			PARA_INFO_LOG("chunk #%lu: %zd\n", afi->chunks_total,
-//				afi->chunk_table[afi->chunks_total]);
-		afi->chunks_total++;
-		if (afi->chunks_total == 1) {
-			freq_avg = freq;
-			br_avg = br;
-			old_br = br;
-			fl_avg = fl;
-			continue;
+			afhi->chunk_table = para_realloc(afhi->chunk_table,
+				chunk_table_size * sizeof(uint32_t));
 		}
-		freq_avg += (freq - freq_avg) / (afi->chunks_total + 1);
-		fl_avg += (fl - fl_avg) / (afi->chunks_total + 1);
-		br_avg += (br - br_avg) / ((long)afi->chunks_total + 1);
-		if (old_br != br)
-			mp3.vbr = 1;
+		afhi->chunk_table[afhi->chunks_total] = fpos;
+		afhi->chunks_total++;
+		freq_sum += freq;
+		br_sum += br;
+		if (afhi->chunks_total != 1 && old_br != br)
+			vbr = 1;
 		old_br = br;
 	}
 	ret = -E_MP3_INFO;
-	if (!afi->chunks_total || !freq_avg || !br_avg)
+	if (!freq_sum || !br_sum)
 		goto err_out;
-	afi->chunk_table[afi->chunks_total] = numbytes - 1;
-	mp3.br_average = br_avg;
-	mp3.freq = freq_avg;
-	afi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
-	tv_divide(afi->chunks_total, &total_time, &afi->chunk_tv);
-	PARA_DEBUG_LOG("%lu chunks, each %lums\n", afi->chunks_total,
-		tv2ms(&afi->chunk_tv));
-	tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
-	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv));
+	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);
+	PARA_DEBUG_LOG("%lu chunks, each %lums\n", afhi->chunks_total,
+		tv2ms(&afhi->chunk_tv));
+	tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
+	afhi->info_string = make_message("%s: %cbr, %s\n%s",
+		status_item_list[SI_AUDIO_FILE_INFO], vbr? 'v' : 'c',
+		header_mode(&header), taginfo);
+	free(taginfo);
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	free(afi->chunk_table);
+	free(taginfo);
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	free(afhi->chunk_table);
 	return ret;
 }
 
 /*
  * Read mp3 information from audio file
  */
-static int mp3_get_file_info(char *map, off_t numbytes,
-		struct audio_format_info *afi)
+static int mp3_get_file_info(char *map, size_t numbytes, int fd,
+		struct afh_info *afhi)
 {
 	int ret;
 
-	ret = mp3_read_info((unsigned char *)map, numbytes, afi);
+	ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi);
 	if (ret < 0)
 		return ret;
-	write_info_str(afi);
-	if (afi->seconds_total < 2 || !afi->chunks_total)
+	if (afhi->seconds_total < 2 || !afhi->chunks_total)
 		return -E_MP3_INFO;
 	return 1;
 }