X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=709e7d4b3c5e7278c72ba6fb2451c8798dcab411;hp=a3e0f6911cea762eabe1bb59a09b277212643f4b;hb=3af76637cf5a96111d76e422b6f16a3883c931b5;hpb=15fb206efa462125e3a3a4cab0e893c0ca1781ea

diff --git a/ogg_afh.c b/ogg_afh.c
index a3e0f691..709e7d4b 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -28,23 +28,20 @@
 #include "afh.h"
 #include "error.h"
 #include "string.h"
-#include "fd.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
 static OggVorbis_File *oggvorbis_file;
-static FILE *infile;
-static int header_len, vi_channels;
+static int header_len;
 static char *header;
-static ssize_t *chunk_table, max_chunk_len, num_chunks;
+static ssize_t *chunk_table;
 static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal;
 
-static int ogg_compute_header_len(void)
+static int ogg_compute_header_len(FILE *file)
 {
-	int ret, len, in = fileno(infile);
+	int ret, len, in = fileno(file);
 	unsigned int serial;
 	char *buf;
 	ogg_page page;
@@ -119,7 +116,7 @@ err1:
 	return ret;
 }
 
-static void tunetable(void)
+static void tunetable(long unsigned num_chunks)
 {
 	int i = 1, j = -1, lp = 1;
 	while (i < num_chunks) {
@@ -146,13 +143,14 @@ static void tunetable(void)
 
 /*
  * Alloc and fill array table of byte offsets. chunk_table[i] is the
- * offset in the current infile at which the sample containing time i *
+ * offset in the current input file at which the sample containing time i *
  * CHUNK_TIME begins.
  */
-static void ogg_compute_chunk_table(double time_total)
+static long unsigned ogg_compute_chunk_table(double time_total)
 {
 	int i, ret, num;
-	ssize_t pos = 0, min = 0, old_pos;
+	ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
+	long unsigned num_chunks;
 
 	old_pos = 0;
 	ret = 0;
@@ -162,7 +160,6 @@ static void ogg_compute_chunk_table(double time_total)
 	chunk_table = para_malloc(num * sizeof(size_t));
 	chunk_table[0] = 0;
 	max_chunk_len = 0;
-	rewind(infile);
 	for (i = 1; ret == 0; i++) {
 		ogg_int64_t diff;
 		ret = ov_time_seek(oggvorbis_file, i * chunk_time);
@@ -181,10 +178,10 @@ static void ogg_compute_chunk_table(double time_total)
 	}
 	num_chunks = i - 1;
 	chunk_table[i] = pos;
-	tunetable();
+	tunetable(num_chunks);
 	PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
 		num_chunks, chunk_time, max_chunk_len, min);
-	rewind(infile);
+	return num_chunks;
 }
 
 static void ogg_close_audio_file(void)
@@ -200,7 +197,6 @@ static void ogg_close_audio_file(void)
 	header_len = 0;
 	free(chunk_table);
 	chunk_table = NULL;
-	num_chunks = 0;
 }
 
 static int ogg_save_header(FILE *file, int len)
@@ -225,11 +221,11 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	double time_total;
 	vorbis_info *vi;
 	ogg_int64_t raw_total;
+	long vi_sampling_rate, vi_bitrate;
 
-	infile = file;
 	if (!file)
 		return -E_OGG_NO_FILE;
-	ret = ogg_compute_header_len();
+	ret = ogg_compute_header_len(file);
 	if (ret < 0)
 		return ret;
 	ret = ogg_save_header(file, header_len);
@@ -252,16 +248,15 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	*seconds = time_total;
 	vi_sampling_rate = vi->rate;
 	vi_bitrate = ov_bitrate(oggvorbis_file, 0);
-	vi_bitrate_nominal = vi->bitrate_nominal;
-	vi_channels = vi->channels;
-	ogg_compute_chunk_table(time_total);
-	*frames = num_chunks;
+	rewind(file);
+	*frames = ogg_compute_chunk_table(time_total);
+	rewind(file);
 	*vss_chunk_table = chunk_table;
-	sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n"
+	sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
 		"audio_file_info2: \n"
 		"audio_file_info3: \n",
-		num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
-		vi_sampling_rate / 1000, vi_channels, vi_bitrate / 1000
+		*frames, (long unsigned) (chunk_time * 1000 * 1000),
+		vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
 		);
 	rewind(file);
 	return 1;