X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=f972c630ee837953fe6d56c11b332c1124e131d3;hp=fcc88362981c815cd0a04823d504a7ea4df5dec0;hb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9;hpb=0bd031509add6dccedb04a1e79420a7a9ca02711

diff --git a/ogg_afh.c b/ogg_afh.c
index fcc88362..f972c630 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -25,7 +25,6 @@
 #include "server.cmdline.h"
 #include "server.h"
 #include "vss.h"
-#include "afh.h"
 #include "error.h"
 #include "string.h"
 
@@ -33,18 +32,72 @@
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
-static OggVorbis_File *oggvorbis_file;
-static FILE *infile;
-static int header_len, inbuf_size, vi_channels;
-static char *header, *inbuf;
-static ssize_t *chunk_table, max_chunk_len;
+FILE *audio_file;
 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_save_header(FILE *file, struct audio_format_info *afi)
+{
+	int ret;
+
+	afi->header = para_malloc(afi->header_len);
+	rewind(file);
+	ret = read(fileno(file), afi->header, afi->header_len);
+	if (ret == afi->header_len)
+		return 1;
+	free(afi->header);
+	return -E_OGG_READ;
+}
+
+static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
+{
+	int ret, len, in = fileno(file);
 	unsigned int serial;
 	char *buf;
 	ogg_page page;
@@ -104,11 +157,11 @@ static int ogg_compute_header_len(void)
 	ogg_stream_packetout(stream_in, &packet);
 	ogg_stream_packetin(stream_out, &packet);
 
-	header_len = 0;
+	afi->header_len = 0;
 	while (ogg_stream_flush(stream_out, &page))
-		header_len += page.body_len + page.header_len;
-	ret = len;
-	PARA_INFO_LOG("header_len = %d\n", header_len);
+		afi->header_len += page.body_len + page.header_len;
+	PARA_INFO_LOG("header_len = %d\n", afi->header_len);
+	ret = ogg_save_header(file, afi);
 err2:
 	ogg_stream_destroy(stream_in);
 	ogg_stream_destroy(stream_out);
@@ -119,60 +172,36 @@ 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,
+	struct audio_format_info *afi, 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(size_t));
-	chunk_table[0] = 0;
+	afi->chunk_table = para_malloc(num * sizeof(size_t));
+	afi->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);
-		chunk_table[i] = pos;
+		afi->chunk_table[i] = pos;
 		if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
 			PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
 				"size: %zd\n", i - 1,
@@ -180,171 +209,76 @@ static void ogg_compute_chunk_table(double time_total)
 		old_pos = pos;
 	}
 	num_chunks = i - 1;
-	chunk_table[i] = pos;
-	tunetable();
-	PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+	afi->chunk_table[i] = pos;
+	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(inbuf);
-	inbuf = NULL;
-	inbuf_size = 0;
-}
-
-static int ogg_save_header(FILE *file, int len)
-{
-	int ret;
-
-	header = para_malloc(len);
-	rewind(file);
-	ret = read(fileno(file), header, len);
-	if (ret != len)
-		return -E_OGG_READ;
-	return 1;
+	fclose(audio_file);
 }
 
 /*
  * 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)
+static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
 {
 	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();
-	if (ret < 0)
-		return ret;
-	ret = ogg_save_header(file, header_len);
+	ret = ogg_compute_header_len(file, afi);
 	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);
-	*seconds = time_total;
+	time_total = ov_time_total(&of, -1);
+	raw_total = ov_raw_total(&of, -1);
+	afi->seconds_total = 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;
-	sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
+	vi_bitrate = ov_bitrate(&of, 0);
+	rewind(file);
+	afi->chunks_total = ogg_compute_chunk_table(&of, afi, time_total);
+	rewind(file);
+	sprintf(afi->info_string, "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
+		afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
+		vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
 		);
 	rewind(file);
-	return 1;
+	audio_file = file;
+	afi->chunk_tv.tv_sec = 0;
+	afi->chunk_tv.tv_usec = 250 * 1000;
+	tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
+	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(afi->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 inbuf;
-	}
-	if (cs < 0) { /* eof */
-		*len = 0;
-		return NULL;
-	}
-	*len = cs;
-	if (!inbuf || inbuf_size < *len) {
-		PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-			inbuf_size, *len);
-		inbuf = para_realloc(inbuf, *len);
-		inbuf_size = *len;
-	}
-	ret = read(fileno(infile), inbuf, *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 inbuf;
-}
-
-static char *ogg_get_header_info(int *len)
-{
-	*len = header_len;
-	return header;
-}
-
 static const char* ogg_suffixes[] = {"ogg", NULL};
 
 /**
@@ -355,13 +289,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;
-	af->chunk_tv.tv_usec = 250 * 1000;
-	tv_scale(3, &af->chunk_tv, &af->eof_tv);
 	af->suffixes = ogg_suffixes;
 }