X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=dd0a54051c4196e6cebac887ec183f317bbe5cf4;hp=d295f2d31ba1a482f7c67a0d0663a1efc5c82867;hb=3d075bb43197cf3c5dbe23bb78e3b43a5f4bcca1;hpb=505cfe0c6c8f9ef79d259ee64404ab40f2057081

diff --git a/ogg_afh.c b/ogg_afh.c
index d295f2d3..dd0a5405 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -33,18 +33,62 @@
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
-static OggVorbis_File *oggvorbis_file;
-static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
-static ssize_t *chunk_table, max_chunk_len;
+FILE *audio_file;
+static int header_len;
+static char *header;
+static ssize_t *chunk_table;
 static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
-	num_chunks;
 
-static int ogg_compute_header_len(void)
+static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
-	int ret, len, in = fileno(infile);
+	FILE *f = datasource;
+	return fread(buf, size, nmemb, f);
+}
+
+static int cb_seek(__a_unused void *datasource, ogg_int64_t offset,
+		int whence)
+{
+	FILE *f = datasource;
+	return fseek(f, offset, whence);
+}
+
+/* don't do anything as vss still needs the open filehandle */
+static int cb_close(__a_unused void *datasource)
+{
+	return 0;
+}
+
+long cb_tell(void *datasource)
+{
+	FILE *f = datasource;
+	return ftell(f);
+}
+
+int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
+{
+	int ret = ov_open_callbacks(datasource, vf,
+		NULL, /* no initial buffer */
+		0, /* no initial bytes */
+		c); /* the ov_open_callbacks */
+
+	/* FIXME: provide better error codes */
+	if (ret == OV_EREAD)
+		return -E_OGG_READ;
+	if (ret == OV_ENOTVORBIS)
+		return -E_OGG_READ;
+	if (ret == OV_EVERSION)
+		return -E_OGG_READ;
+	if (ret == OV_EBADHEADER)
+		return -E_OGG_READ;
+	if (ret < 0)
+		return -E_OGG_READ;
+	return 1;
+
+}
+
+static int ogg_compute_header_len(FILE *file)
+{
+	int ret, len, in = fileno(file);
 	unsigned int serial;
 	char *buf;
 	ogg_page page;
@@ -81,11 +125,9 @@ static int ogg_compute_header_len(void)
 		goto err2;
 	}
 	ret = -E_VORBIS;
-	if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0) {
+	if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
 		goto err2;
-	} else
-		PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels,
-			vi.rate);
+	PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
 	ogg_stream_packetin(stream_out, &packet);
 
 	ret = ogg_sync_pageout(sync_in, &page);
@@ -121,56 +163,32 @@ err1:
 	return ret;
 }
 
-static void tunetable(void)
-{
-	int i = 1, j = -1, lp = 1;
-	while (i < num_chunks) {
-		if (chunk_table[i] == chunk_table[lp]) {
-			i++;
-			continue;
-		}
-		if (j < 0)
-			tv_scale(i, &af->chunk_tv, &af->eof_tv);
-		for (j = lp; j < i; j++)
-			chunk_table[j] = chunk_table[i];
-		lp = i;
-	}
-#if 1
-	for (i = 2; i < num_chunks; i++)
-		if (chunk_table[i] != chunk_table[1])
-			break;
-	lp = i;
-	for (i = 2; i < num_chunks - lp; i++)
-		chunk_table[i] = chunk_table[i + lp];
-#endif
-}
-
-
 /*
  * 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 *
- * CHUNK_TIME begins.
+ * offset in the current input file at which the sample containing time i *
+ * CHUNK_TIME begins. Always successful.
  */
-static void ogg_compute_chunk_table(double time_total)
+static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
+	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;
 	num = time_total / chunk_time + 3;
 	PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
 		chunk_time, num);
-	chunk_table = para_malloc(num * sizeof(ogg_int64_t));
+	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);
+		ret = ov_time_seek(of, i * chunk_time);
 		if (ret)
 			break;
-		pos = ov_raw_tell(oggvorbis_file);
+		pos = ov_raw_tell(of);
 		diff = pos - old_pos;
 		max_chunk_len = PARA_MAX(max_chunk_len, diff);
 		min = (i == 1)? diff : PARA_MIN(min, diff);
@@ -183,29 +201,16 @@ static void ogg_compute_chunk_table(double time_total)
 	}
 	num_chunks = i - 1;
 	chunk_table[i] = pos;
-	tunetable();
-	PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+	PARA_INFO_LOG("%lu 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)
 {
-	if (oggvorbis_file) {
-		PARA_DEBUG_LOG("%s", "ov_clear\n");
-		ov_clear(oggvorbis_file);
-		free(oggvorbis_file);
-		oggvorbis_file = NULL;
-	}
 	free(header);
-	header = NULL;
-	header_len = 0;
 	free(chunk_table);
-	chunk_table = NULL;
-	num_chunks = 0;
-	free(oggbuf);
-	oggbuf = NULL;
-	oggbuf_len = 0;
+	fclose(audio_file);
 }
 
 static int ogg_save_header(FILE *file, int len)
@@ -215,132 +220,72 @@ static int ogg_save_header(FILE *file, int len)
 	header = para_malloc(len);
 	rewind(file);
 	ret = read(fileno(file), header, len);
-	if (ret != len)
-		return -E_OGG_READ;
-	return 1;
+	if (ret == len)
+		return 1;
+	free(header);
+	return -E_OGG_READ;
 }
 
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
 static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
-	int *seconds)
+	int *seconds, size_t **vss_chunk_table)
 {
 	int ret;
 	double time_total;
 	vorbis_info *vi;
 	ogg_int64_t raw_total;
+	long vi_sampling_rate, vi_bitrate;
+	OggVorbis_File of;
+	static const ov_callbacks ovc = {
+		.read_func = cb_read,
+		.seek_func = cb_seek,
+		.close_func = cb_close,
+		.tell_func = cb_tell
+	};
 
-	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);
 	if (ret < 0)
 		return ret;
 	rewind(file);
-	oggvorbis_file = para_malloc(sizeof(OggVorbis_File));
-	ret = ov_open(file, oggvorbis_file, NULL, 0);
-	if (ret < 0) {
-		free(oggvorbis_file);
-		free(header);
-		return -E_OGG_OPEN;
-	}
+	ret = ogg_open_callbacks(file, &of, ovc);
+	if (ret < 0)
+		goto err;
 	ret = -E_OGG_INFO;
-	vi = ov_info(oggvorbis_file, 0);
+	vi = ov_info(&of, 0);
 	if (!vi)
 		goto err;
-	time_total = ov_time_total(oggvorbis_file, -1);
-	raw_total = ov_raw_total(oggvorbis_file, -1);
+	time_total = ov_time_total(&of, -1);
+	raw_total = ov_raw_total(&of, -1);
 	*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;
+	vi_bitrate = ov_bitrate(&of, 0);
+	rewind(file);
+	*frames = ogg_compute_chunk_table(&of, time_total);
+	rewind(file);
+	*vss_chunk_table = chunk_table;
 	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;
+	audio_file = file;
+	ret = 1;
 err:
-	ogg_close_audio_file();
-	return ret;
-}
-
-/*
- * Simple stream reposition routine
- */
-static int ogg_reposition_stream(long unsigned request)
-{
-	int ret;
-	long seek;
-
-	seek = chunk_table[request];
-	ret = fseek(infile, seek, SEEK_SET);
-	PARA_DEBUG_LOG("seek to %li returned %d. offset:%li\n", seek,
-		ret, ftell(infile));
-	return ret < 0? -E_OGG_REPOS : 1;
-}
-
-static ogg_int64_t get_chunk_size(long unsigned chunk_num)
-{
-	ogg_int64_t ret;
-	if (chunk_num >= num_chunks)
-		return -1;
-	ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
-	if (!ret)
-		return ret;
-#if 0
-	PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
-		chunk_num,
-		chunk_table[chunk_num],
-		chunk_table[chunk_num + 1] - 1,
-		ret);
-#endif
+	ov_clear(&of); /* keeps the file open */
+	if (ret < 0)
+		free(header);
 	return ret;
 }
 
-static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-	int ret;
-	ogg_int64_t cs = get_chunk_size(current_chunk);
-	if (!cs) { /* nothing to send for this run */
-		*len = 0;
-		return oggbuf;
-	}
-	if (cs < 0) { /* eof */
-		*len = 0;
-		return NULL;
-	}
-	*len = cs;
-	if (!oggbuf || oggbuf_len < *len) {
-		PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-			oggbuf_len, *len);
-		oggbuf = para_realloc(oggbuf, *len);
-		oggbuf_len = *len;
-	}
-	ret = read(fileno(infile), oggbuf, *len);
-	if (!ret) {
-		*len = 0;
-		return NULL;
-	}
-	if (ret < 0) {
-		*len = -E_OGG_READ;
-		return NULL;
-	}
-	if (ret != *len)
-		PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
-	*len = ret;
-	return oggbuf;
-}
-
 static char *ogg_get_header_info(int *len)
 {
 	*len = header_len;
@@ -357,9 +302,7 @@ static const char* ogg_suffixes[] = {"ogg", NULL};
 void ogg_init(struct audio_format_handler *p)
 {
 	af = p;
-	af->reposition_stream = ogg_reposition_stream;
 	af->get_file_info = ogg_get_file_info,
-	af->read_chunk = ogg_read_chunk;
 	af->close_audio_file = ogg_close_audio_file;
 	af->get_header_info = ogg_get_header_info;
 	af->chunk_tv.tv_sec = 0;