From: Andre Noll <maan@systemlinux.org>
Date: Sat, 10 Mar 2007 19:31:00 +0000 (+0100)
Subject: ogg_afh.c: Switch to ogg vorbis callbacks
X-Git-Tag: v0.2.16~42
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2df9761968e46b0e12106f2a0586a3a69103c4f1;p=paraslash.git

ogg_afh.c: Switch to ogg vorbis callbacks

This allows to call ov_clear() already during ogg_get_file_info() which
in turn simplifies ogg_close_audio_file().

This is a preparation for moving the close function of the audio
format handlers to the virtual streaming system as they all do
essentially the same now.
---

diff --git a/ogg_afh.c b/ogg_afh.c
index 6211deb3..3056a819 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -33,12 +33,59 @@
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
-static OggVorbis_File *oggvorbis_file;
+FILE *audio_file;
 static int header_len;
 static char *header;
 static ssize_t *chunk_table;
 static struct audio_format_handler *af;
 
+static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
+{
+	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);
@@ -144,9 +191,10 @@ static void tunetable(long unsigned num_chunks)
 /*
  * Alloc and fill array table of byte offsets. chunk_table[i] is the
  * offset in the current input file at which the sample containing time i *
- * CHUNK_TIME begins.
+ * CHUNK_TIME begins. Always successful.
  */
-static long unsigned 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 max_chunk_len, pos = 0, min = 0, old_pos;
@@ -162,10 +210,10 @@ static long unsigned ogg_compute_chunk_table(double time_total)
 	max_chunk_len = 0;
 	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);
@@ -178,7 +226,7 @@ static long unsigned ogg_compute_chunk_table(double time_total)
 	}
 	num_chunks = i - 1;
 	chunk_table[i] = pos;
-	tunetable(num_chunks);
+//	tunetable(num_chunks);
 	PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
 		num_chunks, chunk_time, max_chunk_len, min);
 	return num_chunks;
@@ -186,17 +234,9 @@ static long unsigned ogg_compute_chunk_table(double time_total)
 
 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;
+	fclose(audio_file);
 }
 
 static int ogg_save_header(FILE *file, int len)
@@ -206,9 +246,10 @@ 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;
 }
 
 /*
@@ -222,6 +263,13 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	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
+	};
 
 	if (!file)
 		return -E_OGG_NO_FILE;
@@ -232,24 +280,20 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 	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 = ov_bitrate(&of, 0);
 	rewind(file);
-	*frames = ogg_compute_chunk_table(time_total);
+	*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"
@@ -259,9 +303,12 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
 		vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
 		);
 	rewind(file);
-	return 1;
+	audio_file = file;
+	ret = 1;
 err:
-	ogg_close_audio_file();
+	ov_clear(&of); /* keeps the file open */
+	if (ret < 0)
+		free(header);
 	return ret;
 }