X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=d0be0ad95459390e37879870b349e88783618509;hp=d26d9094be93c236cb3bd7b6dadd5903e553c80d;hb=73073e4f4209c874f2f41e270376a9802862df8f;hpb=57a8d22ad5e81dc815390685ae5f83c0f16156e7

diff --git a/mp3_afh.c b/mp3_afh.c
index d26d9094..73e744ec 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 Andre Noll <maan@tuebingen.mpg.de>
  *
- *     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,14 +16,13 @@
  *			 Johannes Overmann <overmann@iname.com>
  */
 
-#include "server.cmdline.h"
-#include "server.h"
-#include "vss.h"
+#include <regex.h>
+
+#include "para.h"
 #include "error.h"
-#include "fd.h"
+#include "afh.h"
 #include "string.h"
-
-/** \cond some defines and structs which are only used in this file */
+#include "fd.h"
 
 /*
  * MIN_CONSEC_GOOD_FRAMES defines how many consecutive valid MP3 frames we need
@@ -59,24 +46,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 */
 	{44100,48000,32000,50000}, /* MPEG 1.0 */
@@ -100,7 +69,367 @@ 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_ID3TAG
+
+#include <id3tag.h>
+
+static char *get_utf8(id3_ucs4_t const *string)
+{
+	if (!string)
+		return NULL;
+	return (char *)id3_ucs4_utf8duplicate(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_utf8(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_utf8(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;
+}
+
+/* this only sets values which are undefined so far */
+static void parse_frames(struct id3_tag *id3_t, struct taginfo *tags)
+{
+	int i;
+
+	for (i = 0; i < id3_t->nframes; i++) {
+		struct id3_frame *fr = id3_t->frames[i];
+		if (!strcmp(fr->id, ID3_FRAME_TITLE)) {
+			if (!tags->title)
+				tags->title = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, ID3_FRAME_ARTIST)) {
+			if (!tags->artist)
+				tags->artist = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, ID3_FRAME_ALBUM)) {
+			if (!tags->album)
+				tags->album = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, ID3_FRAME_YEAR)) {
+			if (!tags->year)
+				tags->year = get_strings(fr);
+			continue;
+		}
+		if (!strcmp(fr->id, ID3_FRAME_COMMENT)) {
+			if (!tags->comment)
+				tags->comment = get_strings(fr);
+			continue;
+		}
+	}
+}
+
+static int mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd,
+		struct taginfo *tags)
+{
+	int ret = 0;
+	struct id3_tag *id3_t;
+
+	/* id3v2 tags are usually located at the beginning. */
+	id3_t = id3_tag_parse(map, numbytes);
+	if (id3_t) {
+		parse_frames(id3_t, tags);
+		ret |= 2;
+		id3_tag_delete(id3_t);
+	}
+	/* Also look for an id3v1 tag at the end of the file. */
+	if (numbytes >= 128) {
+		id3_t = id3_tag_parse(map + numbytes - 128, 128);
+		if (id3_t) {
+			parse_frames(id3_t, tags);
+			ret |= 1;
+			id3_tag_delete(id3_t);
+		}
+	}
+	return ret;
+}
+
+/* These helpers are not mentioned in the libid3tag header file. */
+void id3_field_init(union id3_field *field, enum id3_field_type type);
+void id3_field_finish(union id3_field *field);
+
+/*
+ * Frames of type ID3_FRAME_COMMENT contain three fields of type language,
+ * string, and fullstring. The third field contains the actual comment.
+ */
+static int set_comment_fields(struct id3_frame *fr, id3_ucs4_t *ucs4_val)
+{
+	int ret;
+	union id3_field *field;
+
+	field = id3_frame_field(fr, 1);
+	id3_field_init(field, ID3_FIELD_TYPE_LANGUAGE);
+
+	field = id3_frame_field(fr, 2);
+	id3_field_init(field, ID3_FIELD_TYPE_STRING);
+
+	field = id3_frame_field(fr, 3);
+	id3_field_init(field, ID3_FIELD_TYPE_STRINGFULL);
+	ret = id3_field_setfullstring(field, ucs4_val);
+	if (ret < 0)
+		return -E_ID3_SETSTRING;
+	return 1;
+}
+
+/*
+ * UCS-4 stands for Universal Character Set where each character uses exactly
+ * 32 bits. It is also known as UTF-32, see ISO 10646.
+ *
+ * We have to use UCS-4 as an intermediate representation because the functions
+ * of libid3tag which set the tag content expect an array of UCS-4 characters.
+ * Fortunately, libid3tag contains conversion functions from and to UTF-8.
+ */
+static int replace_tag(char const *id, const char *val, struct id3_tag *id3_t,
+		int options)
+{
+	int ret;
+	struct id3_frame *fr;
+	union id3_field *field;
+	id3_ucs4_t *ucs4_val;
+
+	/* First, detach all frames that match the given id. */
+	while ((fr = id3_tag_findframe(id3_t, id, 0))) {
+		PARA_INFO_LOG("deleting %s frame\n", id);
+		ret = id3_tag_detachframe(id3_t, fr);
+		if (ret < 0)
+			return -E_ID3_DETACH;
+		id3_frame_delete(fr);
+	}
+	if (!val || !*val)
+		return 0;
+	fr = id3_frame_new(id);
+	PARA_DEBUG_LOG("frame desc: %s, %d fields\n", fr->description, fr->nfields);
+
+	/* Frame 0 contains the encoding. We always use UTF-8. */
+	field = id3_frame_field(fr, 0);
+	id3_field_init(field, ID3_FIELD_TYPE_TEXTENCODING);
+	ret = id3_field_settextencoding(field, ID3_FIELD_TEXTENCODING_UTF_8);
+	if (ret < 0)
+		return -E_ID3_SETENCODING;
+	/* create UCS-4 representation */
+	ucs4_val = id3_utf8_ucs4duplicate((const id3_utf8_t *)val);
+
+	if (strcmp(id, ID3_FRAME_COMMENT) == 0)
+		ret = set_comment_fields(fr, ucs4_val);
+	else {
+		/* Non-comment frames contain the value in field 1. */
+		field = id3_frame_field(fr, 1);
+		if (options & ID3_TAG_OPTION_ID3V1) {
+			id3_ucs4_t *ptr[] = {ucs4_val, NULL};
+			id3_field_init(field, ID3_FIELD_TYPE_STRINGLIST);
+			ret = id3_field_setstrings(field, 1, ptr);
+		} else {
+			id3_field_init(field, ID3_FIELD_TYPE_STRINGFULL);
+			ret = id3_field_setfullstring(field, ucs4_val);
+		}
+	}
+	free(ucs4_val);
+	if (ret < 0)
+		return -E_ID3_SETSTRING;
+
+	PARA_INFO_LOG("attaching %s frame, value: %s\n", id, val);
+	ret = id3_tag_attachframe(id3_t, fr);
+	if (ret < 0)
+		return -E_ID3_ATTACH;
+	return 1;
+}
+
+static int replace_tags(struct id3_tag *id3_t, struct taginfo *tags)
+{
+	int ret, options = id3_tag_options(id3_t, 0, 0);
+
+	ret = replace_tag(ID3_FRAME_ARTIST, tags->artist, id3_t, options);
+	if (ret < 0)
+		return ret;
+	ret = replace_tag(ID3_FRAME_TITLE, tags->title, id3_t, options);
+	if (ret < 0)
+		return ret;
+	ret = replace_tag(ID3_FRAME_ALBUM, tags->album, id3_t, options);
+	if (ret < 0)
+		return ret;
+	ret = replace_tag(ID3_FRAME_YEAR, tags->year, id3_t, options);
+	if (ret < 0)
+		return ret;
+	ret = replace_tag(ID3_FRAME_COMMENT, tags->comment, id3_t, options);
+	if (ret < 0)
+		return ret;
+	return 1;
+}
+
+/* id3_tag_delete() does not seem to work due to refcount issues. */
+static void free_tag(struct id3_tag *id3_t)
+{
+	int i, j;
+	for (i = 0; i < id3_t->nframes; i++) {
+		struct id3_frame *fr = id3_t->frames[i];
+		for (j = 0; j < fr->nfields; j++) {
+			union id3_field *field = &fr->fields[j];
+			id3_field_finish(field);
+		}
+		free(fr);
+	}
+	free(id3_t->frames);
+	free(id3_t);
+}
+
+static int mp3_rewrite_tags(const char *map, size_t mapsize,
+		struct taginfo *tags, int fd, __a_unused const char *filename)
+{
+	int ret;
+	id3_length_t old_v2size, new_v2size;
+	id3_byte_t v1_buffer[128], *v2_buffer;
+	size_t data_sz;
+	struct id3_tag *v1_tag = NULL, *v2_tag = NULL;
+
+	if (mapsize >= 128) {
+		v1_tag = id3_tag_parse((const id3_byte_t *)map + mapsize - 128,
+			128);
+		if (v1_tag) {
+			PARA_NOTICE_LOG("replacing id3v1 tag\n");
+			ret = replace_tags(v1_tag, tags);
+			if (ret < 0)
+				goto out;
+			id3_tag_render(v1_tag, v1_buffer);
+		}
+	}
+	old_v2size = 0;
+	v2_tag = id3_tag_parse((const id3_byte_t *)map, mapsize);
+	if (v2_tag) {
+		PARA_NOTICE_LOG("replacing id3v2 tag\n");
+		old_v2size = v2_tag->paddedsize;
+	} else if (!v1_tag) {
+		PARA_NOTICE_LOG("no id3 tags found, adding id3v2 tag\n");
+		v2_tag = id3_tag_new();
+		assert(v2_tag);
+	}
+	if (v2_tag) {
+		/*
+		 * Turn off all options to avoid creating an extended header.
+		 * id321 does not understand it.
+		 */
+		id3_tag_options(v2_tag, ~0U, 0);
+		ret = replace_tags(v2_tag, tags);
+		if (ret < 0)
+			goto out;
+		new_v2size = id3_tag_render(v2_tag, NULL);
+		v2_buffer = para_malloc(new_v2size);
+		id3_tag_render(v2_tag, v2_buffer);
+		PARA_INFO_LOG("writing v2 tag (%lu bytes)\n", new_v2size);
+		ret = write_all(fd, (char *)v2_buffer, new_v2size);
+		free(v2_buffer);
+		if (ret < 0)
+			goto out;
+	}
+	data_sz = mapsize - old_v2size;
+	if (v1_tag && data_sz >= 128)
+		data_sz -= 128;
+	PARA_INFO_LOG("writing data part (%zu bytes)\n", data_sz);
+	ret = write_all(fd, map + old_v2size, data_sz);
+	if (ret < 0)
+		goto out;
+	if (v1_tag) {
+		PARA_INFO_LOG("writing v1 tag\n");
+		ret = write_all(fd, (char *)v1_buffer, 128);
+	}
+out:
+	if (v1_tag)
+		free_tag(v1_tag);
+	if (v2_tag)
+		free_tag(v2_tag);
+	return ret;
+}
+
+#else /* HAVE_ID3TAG */
+
+/*
+ * 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 int mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd,
+	struct taginfo *tags)
+{
+	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 0;
+	}
+	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);
+	tags->artist = para_strdup(artist);
+	tags->title = para_strdup(title);
+	tags->year = para_strdup(year);
+	tags->album = para_strdup(album);
+	tags->comment = para_strdup(comment);
+	return 1;
+}
+#endif /* HAVE_ID3TAG */
 
 static int header_frequency(struct mp3header *h)
 {
@@ -115,9 +444,19 @@ static const char *header_mode(struct mp3header *h)
 		h->mode = 4; /* invalid */
 	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 > 3 || h->bitrate > 14)
+	if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate)
 		return -E_HEADER_BITRATE;
 	return mp3info_bitrate[h->version & 1][3 - h->layer][h->bitrate - 1];
 }
@@ -138,42 +477,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) &&
@@ -187,262 +493,193 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2)
 	return 0;
 }
 
-/**
+/*
  * get next MP3 frame header.
  *
- * \param stream to read the header from
- * \param header structure that gets filled in by get_header()
- *
- * \return On success, the header frame length is returned.  A return value of
- * zero means that we did not retrieve a valid frame header, and a negative
- * return value indicates an error.
+ * On success, the header frame length is returned and the given header
+ * structure that is filled in.  A return value of zero means that we did not
+ * retrieve a valid frame header, and a negative return value indicates an
+ * error.
  */
-static int get_header(FILE *file, struct mp3header *header)
+static int get_header(unsigned char *map, size_t numbytes, off_t *fpos,
+	struct mp3header *header)
 {
-	unsigned char buffer[FRAME_HEADER_SIZE];
 	int fl, ret;
 
-	if (!file || !header)
-		return -E_MP3_NO_FILE;
-	ret = para_fread(buffer, FRAME_HEADER_SIZE, 1, file);
-	if (ret < FRAME_HEADER_SIZE) {
+	if (*fpos + FRAME_HEADER_SIZE > numbytes) {
+		*fpos = numbytes - 1;
 		header->sync = 0;
-		return ret < 0? ret : 0;
+		return 0;
 	}
-	header->layer = (buffer[1] >> 1) & 3;
-	header->sync = (((int)buffer[0]<<4) | ((int)(buffer[1]&0xE0)>>4));
-	if (buffer[1] & 0x10)
-		header->version = (buffer[1] >> 3) & 1;
+	header->layer = (map[*fpos + 1] >> 1) & 3;
+	header->sync = (((int)map[*fpos]<<4) | ((int)(map[*fpos + 1]&0xE0)>>4));
+	if (map[*fpos + 1] & 0x10)
+		header->version = (map[*fpos + 1] >> 3) & 1;
 	else
 		header->version = 2;
 	if ((header->sync != 0xFFE) || (header->layer != 1)) {
+		ret = 0;
 		header->sync = 0;
-//		PARA_DEBUG_LOG("%s: header not found\n", __func__);
-		return 0;
+		goto out;
 	}
-	header->crc = buffer[1] & 1;
-	header->bitrate = (buffer[2] >> 4) & 0x0F;
-//	PARA_DEBUG_LOG("%s: found header, bitrate: %u\n", __func__,
-//		header->bitrate);
-	header->freq = (buffer[2] >> 2) & 0x3;
-	header->padding = (buffer[2] >>1) & 0x1;
-	header->mode = (buffer[3] >> 6) & 0x3;
+	header->crc = map[*fpos + 1] & 1;
+	header->bitrate = (map[*fpos + 2] >> 4) & 0x0F;
+	header->freq = (map[*fpos + 2] >> 2) & 0x3;
+	header->padding = (map[*fpos + 2] >>1) & 0x1;
+	header->mode = (map[*fpos + 3] >> 6) & 0x3;
 	fl = frame_length(header);
-	return (fl >= MIN_FRAME_SIZE)? fl : -E_FRAME_LENGTH;
+	ret = (fl >= MIN_FRAME_SIZE)? fl : -E_FRAME_LENGTH;
+out:
+	*fpos += FRAME_HEADER_SIZE;
+	return ret;
 }
 
-/**
+/*
  * find the next mp3 header
  *
- * \return On success, the length of the next frame header. If the end of the
- * file was reached, the function returns zero. On errors, a negative value is
- * returned.
- *
+ * Return the length of the next frame header or zero if the end of the file is
+ * reached.
  */
-static int mp3_seek_next_header(FILE *file)
+static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos,
+	struct mp3header *result)
 {
-	int k, l = 0, c, first_len, ret;
+	int k, l = 0, first_len;
 	struct mp3header h, h2;
 	long valid_start = 0;
 
-	while (1) {
-		while ((c = fgetc(file)) != 255 && (c != EOF))
-			; /* nothing */
-		if (c != 255)
-			return 0;
-		ungetc(c, file);
-		valid_start = ftell(file);
-		first_len = get_header(file, &h);
+	for (; *fpos < numbytes; (*fpos)++) {
+		if (map[*fpos] != 0xff)
+			continue;
+		valid_start = *fpos;
+		first_len = get_header(map, numbytes, fpos, &h);
 		if (first_len <= 0)
 			continue;
-		ret = para_fseek(file, first_len - FRAME_HEADER_SIZE, SEEK_CUR);
-		if (ret < 0)
-			return ret;
+		*fpos += first_len - FRAME_HEADER_SIZE;
 		for (k = 1; k < MIN_CONSEC_GOOD_FRAMES; k++) {
-			if ((l = get_header(file, &h2)) <= 0)
+			if ((l = get_header(map, numbytes, fpos, &h2)) <= 0)
 				break;
 			if (!compare_headers(&h, &h2))
 				break;
-			ret = para_fseek(file, l - FRAME_HEADER_SIZE, SEEK_CUR);
-			if (ret < 0)
-				return ret;
+			*fpos += l - FRAME_HEADER_SIZE;
 		}
 		if (k == MIN_CONSEC_GOOD_FRAMES) {
-			ret = para_fseek(file, valid_start, SEEK_SET);
-			if (ret < 0)
-				return ret;
-			memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
+			*fpos = valid_start;
+			*result = h2;
 			return first_len;
 		}
 	}
+	return 0;
 }
 
-static int mp3_get_id3(FILE *file)
-{
-	char fbuf[4];
-	int ret;
-
-	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';
-	ret = para_fseek(file, -128, SEEK_END);
-	if (ret < 0 )
-		return ret;
-	if (para_fread(fbuf, 1, 3, file) < 0)
-		return -E_FREAD;
-	fbuf[3] = '\0';
-	if (strcmp("TAG", fbuf)) {
-		PARA_INFO_LOG("%s", "no id3 tag\n");
-		return 0;
-	}
-	ret = para_fseek(file, -125, SEEK_END);
-	if (ret < 0)
-		return ret;
-	if (para_fread(mp3.id3.title, 1, 30, file) != 30)
-		return -E_FREAD;
-	mp3.id3.title[30] = '\0';
-	if (para_fread(mp3.id3.artist, 1, 30, file) != 30)
-		return -E_FREAD;
-	mp3.id3.artist[30] = '\0';
-	if (para_fread(mp3.id3.album, 1, 30, file) != 30)
-		return -E_FREAD;
-	mp3.id3.album[30] = '\0';
-	if (para_fread(mp3.id3.year, 1, 4, file) != 4)
-		return -E_FREAD;
-	mp3.id3.year[4] = '\0';
-	if (para_fread(mp3.id3.comment, 1, 30, file) != 30)
-		return -E_FREAD;
-	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);
-	return 1;
-}
-
-static int find_valid_start(FILE *file)
+static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos,
+	struct mp3header *header)
 {
-	int ret, frame_len;
+	int frame_len;
 
-	frame_len = get_header(file, &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(file);
+		frame_len = mp3_seek_next_header(map, numbytes, fpos, header);
 		if (frame_len <= 0)
 			return frame_len;
-	} else {
-		ret = para_fseek(file, -FRAME_HEADER_SIZE, SEEK_CUR);
-		if (ret < 0)
-			return ret;
-	}
+	} else
+		*fpos -= FRAME_HEADER_SIZE;
 	if (frame_len <= 1)
 		return -E_FRAME_LENGTH;
 	return frame_len;
 }
 
-static int mp3_read_info(FILE *file, 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;
+	const char *tag_versions[] = {"no", "id3v1", "id3v2", "id3v1+id3v2"};
 
-	afi->chunks_total = 0;
-	afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
-	ret = mp3_get_id3(file);
-	if (ret < 0)
-		goto err_out;
-	rewind(file);
-	mp3.vbr = 0;
-	mp3.freq = 0;
+	afhi->chunks_total = 0;
+	afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
 	while (1) {
-		int freq, br, fl;
+		int freq, br;
 		struct timeval tmp, cct; /* current chunk time */
-		if (len > 0) {
-			ret = para_fseek(file, len, SEEK_CUR);
-			if (ret < 0)
+		fpos += len;
+		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;
-		}
-		len = find_valid_start(file);
-		if (len <= 0)
+			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;
-		tmp.tv_sec = fl;
+		br = ret;
+		ret = frame_length(&header);
+		if (ret < 0)
+			continue;
+		fl = ret;
+		tmp.tv_sec = fl - header.padding;
 		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] = ftell(file);
-//		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) / (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)
-		goto err_out;
-	ret= para_fseek(file, 0, SEEK_END);
-	if (ret < 0)
+	if (!freq_sum || !br_sum)
 		goto err_out;
-	afi->chunk_table[afi->chunks_total] = ftell(file);
-	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);
-	rewind(file);
-	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("%" PRIu32 "chunks, each %lums\n", afhi->chunks_total,
+		tv2ms(&afhi->chunk_tv));
+	ret = mp3_get_id3(map, numbytes, fd, &afhi->tags);
+	afhi->techinfo = make_message("%cbr, %s, %s tags", vbr? 'v' : 'c',
+		header_mode(&header), tag_versions[ret]);
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	free(afi->chunk_table);
+	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(FILE *file, 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(file, 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;
 }
@@ -458,4 +695,7 @@ void mp3_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = mp3_get_file_info;
 	afh->suffixes = mp3_suffixes;
+#ifdef HAVE_LIBID3TAG
+	afh->rewrite_tags = mp3_rewrite_tags;
+#endif /* HAVE_LIBID3TAG */
 }