X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3_afh.c;h=898547fce4870ebb94beb10ee950dee4b05ea11e;hb=f7b6451de1f334d8ab13a1f9428a1b24a437ba1d;hp=691f1f093c302320b8877cf6588fdec246bb6c51;hpb=4cfbdce5e460934d4724cac63aa718ea6c7af199;p=paraslash.git

diff --git a/mp3_afh.c b/mp3_afh.c
index 691f1f09..898547fc 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -31,7 +31,6 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "vss.h"
-#include "afh.h"
 #include "error.h"
 #include "fd.h"
 #include "string.h"
@@ -46,7 +45,6 @@
 
 #define FRAME_HEADER_SIZE 4
 #define MIN_FRAME_SIZE 21
-#define DEFAULT_INBUF_SIZE 8192
 
 struct mp3header {
 	unsigned long sync;
@@ -71,7 +69,6 @@ struct id3tag {
 };
 
 struct mp3info {
-	char *filename;
 	struct mp3header header;
 	int id3_isvalid;
 	struct id3tag id3;
@@ -82,13 +79,13 @@ struct mp3info {
 };
 
 /** \endcond */
-static int frequencies[3][4] = {
+static const int frequencies[3][4] = {
 	{22050,24000,16000,50000}, /* MPEG 2.0 */
 	{44100,48000,32000,50000}, /* MPEG 1.0 */
 	{11025,12000,8000,50000} /* MPEG 2.5 */
 };
 
-static int mp3info_bitrate[2][3][14] = {
+static const int mp3info_bitrate[2][3][14] = {
 { /* MPEG 2.0 */
 	{32,48,56,64,80,96,112,128,144,160,176,192,224,256}, /* layer 1 */
 	{8,16,24,32,40,48,56,64,80,96,112,128,144,160}, /* layer 2 */
@@ -102,15 +99,13 @@ static int mp3info_bitrate[2][3][14] = {
 }
 };
 
-static int frame_size_index[] = {24000, 72000, 72000};
+static const int frame_size_index[] = {24000, 72000, 72000};
 static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"};
 
 static FILE *infile;
 static struct mp3info mp3;
-static char *inbuf;
-static size_t inbuf_size;
 static struct audio_format_handler *af;
-static ssize_t *chunk_table, num_chunks;
+static ssize_t num_chunks;
 
 static int header_frequency(struct mp3header *h)
 {
@@ -148,16 +143,16 @@ static int frame_length(struct mp3header *header)
 		+ header->padding;
 }
 
-static void write_info_str(char *info_str)
+static void write_info_str(struct audio_format_info *afi)
 {
 	int v = mp3.id3_isvalid;
 
-	snprintf(info_str, MMD_INFO_SIZE,
+	snprintf(afi->info_string, MMD_INFO_SIZE,
 		"audio_file_info1:%d 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",
 		num_chunks,
-		tv2ms(&af->chunk_tv),
+		tv2ms(&afi->chunk_tv),
 		mp3.br_average,
 		mp3.vbr? 'v' : 'c',
 		mp3.freq / 1000,
@@ -194,8 +189,7 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2)
 			(h1->original == h2->original) &&
 			(h1->emphasis == h2->emphasis))
 		return 1;
-	else
-		return 0;
+	return 0;
 }
 
 /**
@@ -252,7 +246,7 @@ static int get_header(FILE *file, struct mp3header *header)
  */
 static int mp3_seek_next_header(void)
 {
-	int k, l = 0, c, first_len;
+	int k, l = 0, c, first_len, ret;
 	struct mp3header h, h2;
 	long valid_start = 0;
 
@@ -266,17 +260,22 @@ static int mp3_seek_next_header(void)
 		first_len = get_header(infile, &h);
 		if (first_len <= 0)
 			continue;
-		if (fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR) < 0)
-			return -E_FSEEK;
+		ret = para_fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR);
+		if (ret < 0)
+			return ret;
 		for (k = 1; k < MIN_CONSEC_GOOD_FRAMES; k++) {
 			if ((l = get_header(infile, &h2)) <= 0)
 				break;
 			if (!compare_headers(&h, &h2))
 				break;
-			fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR);
+			ret = para_fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR);
+			if (ret < 0)
+				return ret;
 		}
 		if (k == MIN_CONSEC_GOOD_FRAMES) {
-			fseek(infile, valid_start, SEEK_SET);
+			ret = para_fseek(infile, valid_start, SEEK_SET);
+			if (ret < 0)
+				return ret;
 			memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
 			return first_len;
 		}
@@ -286,6 +285,7 @@ static int mp3_seek_next_header(void)
 static int mp3_get_id3(void)
 {
 	char fbuf[4];
+	int ret;
 
 	mp3.id3_isvalid = 0;
 	mp3.id3.title[0] = '\0';
@@ -293,8 +293,9 @@ static int mp3_get_id3(void)
 	mp3.id3.album[0] = '\0';
 	mp3.id3.comment[0] = '\0';
 	mp3.id3.year[0] = '\0';
-	if (fseek(infile, -128, SEEK_END))
-		return -E_FSEEK;
+	ret = para_fseek(infile, -128, SEEK_END);
+	if (ret < 0 )
+		return ret;
 	if (para_fread(fbuf, 1, 3, infile) < 0)
 		return -E_FREAD;
 	fbuf[3] = '\0';
@@ -302,8 +303,9 @@ static int mp3_get_id3(void)
 		PARA_INFO_LOG("%s", "no id3 tag\n");
 		return 0;
 	}
-	if (fseek(infile, -125, SEEK_END) < 0)
-		return -E_FSEEK;
+	ret = para_fseek(infile, -125, SEEK_END);
+	if (ret < 0)
+		return ret;
 	if (para_fread(mp3.id3.title, 1, 30, infile) != 30)
 		return -E_FREAD;
 	mp3.id3.title[30] = '\0';
@@ -330,7 +332,7 @@ static int mp3_get_id3(void)
 
 static int find_valid_start(void)
 {
-	int frame_len;
+	int ret, frame_len;
 
 	if (!infile)
 		return -E_MP3_NO_FILE;
@@ -341,15 +343,17 @@ static int find_valid_start(void)
 		frame_len = mp3_seek_next_header();
 		if (frame_len <= 0)
 			return frame_len;
-	} else
-		if (fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR) < 0)
-			return -E_FSEEK;
+	} else {
+		ret = para_fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR);
+		if (ret < 0)
+			return ret;
+	}
 	if (frame_len <= 1)
 		return -E_FRAME_LENGTH;
 	return frame_len;
 }
 
-static int mp3_read_info(void)
+static int mp3_read_info(struct audio_format_info *afi)
 {
 	long fl_avg = 0, freq_avg = 0, br_avg = 0;
 	int ret, len = 0, old_br = -1;
@@ -357,9 +361,7 @@ static int mp3_read_info(void)
 	unsigned chunk_table_size = 1000; /* gets increased on demand */
 
 	num_chunks = 0;
-	inbuf = para_malloc(DEFAULT_INBUF_SIZE);
-	inbuf_size = DEFAULT_INBUF_SIZE;
-	chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
+	afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
 	ret = mp3_get_id3();
 	if (ret < 0)
 		goto err_out;
@@ -370,8 +372,8 @@ static int mp3_read_info(void)
 		int freq, br, fl;
 		struct timeval tmp, cct; /* current chunk time */
 		if (len > 0) {
-			ret = -E_FSEEK;
-			if (fseek(infile, len, SEEK_CUR) < 0)
+			ret = para_fseek(infile, len, SEEK_CUR);
+			if (ret < 0)
 				goto err_out;
 		}
 		len = find_valid_start();
@@ -390,13 +392,13 @@ static int mp3_read_info(void)
 		//PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
 		if (num_chunks >= chunk_table_size) {
 			chunk_table_size *= 2;
-			chunk_table = para_realloc(chunk_table,
+			afi->chunk_table = para_realloc(afi->chunk_table,
 				chunk_table_size * sizeof(size_t));
 		}
-		chunk_table[num_chunks] = ftell(infile);
+		afi->chunk_table[num_chunks] = ftell(infile);
 		if (num_chunks < 10 || !(num_chunks % 1000))
 			PARA_INFO_LOG("chunk #%d: %zd\n", num_chunks,
-				chunk_table[num_chunks]);
+				afi->chunk_table[num_chunks]);
 		num_chunks++;
 		if (num_chunks == 1) {
 //			entry = ftell(infile);
@@ -417,47 +419,44 @@ static int mp3_read_info(void)
 	ret = -E_MP3_INFO;
 	if (!num_chunks || !freq_avg || !br_avg)
 		goto err_out;
-	ret = -E_FSEEK;
-	if (fseek(infile, 0, SEEK_END) < 0)
+	ret= para_fseek(infile, 0, SEEK_END);
+	if (ret < 0)
 		goto err_out;
-	chunk_table[num_chunks] = ftell(infile);
+	afi->chunk_table[num_chunks] = ftell(infile);
 	mp3.br_average = br_avg;
 	mp3.freq = freq_avg;
 	mp3.seconds = (tv2ms(&total_time) + 500) / 1000;
-	tv_divide(num_chunks, &total_time, &af->chunk_tv);
+	tv_divide(num_chunks, &total_time, &afi->chunk_tv);
 	rewind(infile);
-	PARA_DEBUG_LOG("%zu chunks, each %lums\n", num_chunks, tv2ms(&af->chunk_tv));
-	tv_scale(3, &af->chunk_tv, &af->eof_tv);
-	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv));
+	PARA_DEBUG_LOG("%zu chunks, each %lums\n", num_chunks, tv2ms(&afi->chunk_tv));
+	tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
+	PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv));
 	return 1;
 err_out:
 	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	free(chunk_table);
-	free(inbuf);
+	free(afi->chunk_table);
 	return ret;
 }
 
 /*
  * Read mp3 information from audio file
  */
-static int mp3_get_file_info(FILE *audio_file, char *info_str,
-	long unsigned *frames, int *seconds, size_t **vss_chunk_table)
+static int mp3_get_file_info(FILE *audio_file, struct audio_format_info *afi)
 {
 	int ret;
 
 	if (!audio_file)
 		return -E_MP3_NO_FILE;
 	infile = audio_file;
-	ret = mp3_read_info();
+	ret = mp3_read_info(afi);
 	if (ret < 0) {
 		infile = NULL;
 		return ret;
 	}
-	write_info_str(info_str);
-	*frames = num_chunks;
-	*seconds = mp3.seconds;
-	*vss_chunk_table = chunk_table;
-	if (*seconds < 2 || !*frames)
+	write_info_str(afi);
+	afi->chunks_total = num_chunks;
+	afi->seconds_total = mp3.seconds;
+	if (afi->seconds_total < 2 || !afi->chunks_total)
 		return -E_MP3_INFO;
 	return 1;
 }
@@ -468,8 +467,6 @@ static void mp3_close_audio_file(void)
 		return;
 	fclose(infile);
 	infile = NULL;
-	free(chunk_table);
-	free(inbuf);
 }
 
 static const char* mp3_suffixes[] = {"mp3", NULL};
@@ -484,9 +481,5 @@ void mp3_init(struct audio_format_handler *p)
 	af = p;
 	af->get_file_info = mp3_get_file_info;
 	af->close_audio_file = mp3_close_audio_file;
-	af->get_header_info = NULL;
-	/* eof_tv gets overwritten in mp3_get_file_info() */
-	af->eof_tv.tv_sec = 0;
-	af->eof_tv.tv_usec = 100 * 1000;
 	af->suffixes = mp3_suffixes;
 }