X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=eaed16210678d7c9ba6082f733b54264db7e325f;hp=1034091358b51b300737fcd3ae5404ac0a5363fe;hb=2c6032259d6536daabd4132a3737cac08ebdd018;hpb=3a624c04894f5b0fa4a1c0850307b33bf92c8e51

diff --git a/ogg_afh.c b/ogg_afh.c
index 10340913..eaed1621 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -32,19 +32,57 @@
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
-FILE *audio_file;
+struct ogg_datasource {
+	char *map;
+	off_t numbytes;
+	off_t fpos;
+};
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
-	FILE *f = datasource;
-	return fread(buf, size, nmemb, f);
+	struct ogg_datasource *ods = datasource;
+	size_t copy = PARA_MIN(ods->numbytes - ods->fpos, size * nmemb),
+		ret = copy / size;
+	if (!ret)
+		return 0;
+	memcpy(buf, ods->map + ods->fpos, copy);
+//	PARA_INFO_LOG("size: %zd, nmemb: %zd, ret: %zd\n", size, nmemb, ret);
+	ods->fpos += ret * size;
+	return ret;
 }
 
-static int cb_seek(__a_unused void *datasource, ogg_int64_t offset,
+static int cb_seek(void *datasource, ogg_int64_t offset,
 		int whence)
 {
-	FILE *f = datasource;
-	return fseek(f, offset, whence);
+	struct ogg_datasource *ods = datasource;
+	switch (whence) {
+	case SEEK_SET:
+		if (offset >= 0 && offset <= ods->numbytes) {
+			ods->fpos = offset;
+			return 0;
+		}
+		errno = EINVAL;
+		return -1;
+		break;
+	case SEEK_END:
+		if (offset <= 0 && -offset <= ods->numbytes) {
+			ods->fpos = ods->numbytes + offset;
+			return 0;
+		}
+		errno = EINVAL;
+		return -1;
+		break;
+	case SEEK_CUR:
+		if ((offset >= 0 && offset + ods->fpos > ods->numbytes) ||
+				(offset < 0 && offset + ods->fpos < 0)) {
+			errno = EINVAL;
+			return -1;
+		}
+		ods->fpos += offset;
+		return 0;
+	}
+	errno = EINVAL;
+	return -1;
 }
 
 /* don't do anything as vss still needs the open filehandle */
@@ -53,13 +91,13 @@ static int cb_close(__a_unused void *datasource)
 	return 0;
 }
 
-long cb_tell(void *datasource)
+static long cb_tell(void *datasource)
 {
-	FILE *f = datasource;
-	return ftell(f);
+	struct ogg_datasource *ods = datasource;
+	return (unsigned long)ods->fpos;
 }
 
-int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
+static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
 {
 	int ret = ov_open_callbacks(datasource, vf,
 		NULL, /* no initial buffer */
@@ -81,22 +119,16 @@ int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
 
 }
 
-static int ogg_save_header(FILE *file, struct audio_format_info *afi)
+static void ogg_save_header(char *map, 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;
+	memcpy(afi->header, map, afi->header_len);
 }
 
-static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
+static int ogg_compute_header_len(char *map, off_t numbytes,
+		struct audio_format_info *afi)
 {
-	int ret, len, in = fileno(file);
+	int ret, len = PARA_MIN(numbytes, CHUNK_SIZE);
 	unsigned int serial;
 	char *buf;
 	ogg_page page;
@@ -110,11 +142,8 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
 	ogg_sync_init(sync_in);
 	vorbis_info_init(&vi);
 	vorbis_comment_init(&vc);
-	buf = ogg_sync_buffer(sync_in, CHUNK_SIZE);
-	len = read(in, buf, CHUNK_SIZE);
-	ret = -E_OGG_READ;
-	if (len <= 0)
-		goto err1;
+	buf = ogg_sync_buffer(sync_in, len);
+	memcpy(buf, map, len);
 	ogg_sync_wrote(sync_in, len);
 	ret = -E_SYNC_PAGEOUT;
 	if (ogg_sync_pageout(sync_in, &page) <= 0)
@@ -160,7 +189,8 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
 	while (ogg_stream_flush(stream_out, &page))
 		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);
+	ogg_save_header(map, afi);
+	ret = 1;
 err2:
 	ogg_stream_destroy(stream_in);
 	ogg_stream_destroy(stream_out);
@@ -201,10 +231,10 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 		max_chunk_len = PARA_MAX(max_chunk_len, diff);
 		min = (i == 1)? diff : PARA_MIN(min, diff);
 		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,
-				i * chunk_time, pos, pos - old_pos);
+//		if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
+//			PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
+//				"size: %zd\n", i - 1,
+//				i * chunk_time, pos, pos - old_pos);
 		old_pos = pos;
 	}
 	num_chunks = i - 1;
@@ -214,15 +244,11 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	return num_chunks;
 }
 
-static void ogg_close_audio_file(void)
-{
-	fclose(audio_file);
-}
-
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
+static int ogg_get_file_info(char *map, off_t numbytes,
+		struct audio_format_info *afi)
 {
 	int ret;
 	double time_total;
@@ -230,20 +256,18 @@ static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
 	ogg_int64_t raw_total;
 	long vi_sampling_rate, vi_bitrate;
 	OggVorbis_File of;
-	static const ov_callbacks ovc = {
+	const ov_callbacks ovc = {
 		.read_func = cb_read,
 		.seek_func = cb_seek,
 		.close_func = cb_close,
 		.tell_func = cb_tell
 	};
+	struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0};
 
-	if (!file)
-		return -E_OGG_NO_FILE;
-	ret = ogg_compute_header_len(file, afi);
+	ret = ogg_compute_header_len(map, numbytes, afi);
 	if (ret < 0)
 		return ret;
-	rewind(file);
-	ret = ogg_open_callbacks(file, &of, ovc);
+	ret = ogg_open_callbacks(&ods, &of, ovc);
 	if (ret < 0)
 		goto err;
 	ret = -E_OGG_INFO;
@@ -255,9 +279,7 @@ static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
 	afi->seconds_total = time_total;
 	vi_sampling_rate = vi->rate;
 	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"
@@ -265,8 +287,6 @@ static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
 		afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
 		vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
 		);
-	rewind(file);
-	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);
@@ -283,11 +303,10 @@ static const char* ogg_suffixes[] = {"ogg", NULL};
 /**
  * the init function of the ogg vorbis audio format handler
  *
- * \param p pointer to the struct to initialize
+ * \param afh pointer to the struct to initialize
  */
 void ogg_init(struct audio_format_handler *afh)
 {
 	afh->get_file_info = ogg_get_file_info,
-	afh->close_audio_file = ogg_close_audio_file;
 	afh->suffixes = ogg_suffixes;
 }