X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=8e9c17bf48a623bd883274ce5f58dfd6a463f264;hp=b34703de5bd8b8fb46a99a87587c77f86e0ca617;hb=6976e1e3084857a4548ee11eeacb5060ee7f9653;hpb=1d298ac7426fdc13221f759848dbf766ef606c0b

diff --git a/vss.c b/vss.c
index b34703de..8e9c17bf 100644
--- a/vss.c
+++ b/vss.c
@@ -18,19 +18,21 @@
 
 /** \file vss.c the virtual streaming system
  *
- * This contains the audio sending part of para_server which is independent of
- * the current audio format, audio file selector and of the activated senders.
+ * This contains the audio streaming code of para_server which is independent
+ * of the current audio format, audio file selector and of the activated
+ * senders.
  */
 
 #include "server.h"
+#include <sys/mman.h> /* mmap */
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
 #include "afs.h"
-#include "afh.h"
 #include "vss.h"
 #include "send.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 extern const char *status_item_list[];
 
@@ -43,7 +45,8 @@ extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 
-static FILE *audio_file = NULL;
+static int audio_file;
+static char *map;
 
 #if 1
 	void mp3_init(struct audio_format_handler *);
@@ -86,6 +89,8 @@ static struct audio_format_handler afl[] = {
 /** iterate over each supported audio format */
 #define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++)
 
+
+
 /**
  * check if vss status flag \a P (playing) is set
  *
@@ -181,8 +186,7 @@ void vss_init(void)
 
 static int get_file_info(int i)
 {
-	return  afl[i].get_file_info(audio_file, mmd->audio_file_info,
-		&mmd->chunks_total, &mmd->seconds_total);
+	return  afl[i].get_file_info(map, mmd->size, &mmd->afi);
 }
 
 /**
@@ -220,12 +224,10 @@ static int get_audio_format(int omit)
 	int i;
 
 	FOR_EACH_AUDIO_FORMAT(i) {
-		if (i == omit || !afl[i].get_file_info)
+		if (i == omit)
 			continue;
-		rewind(audio_file);
 		if (get_file_info(i) > 0)
 			return i;
-		rewind(audio_file);
 	}
 	return -E_AUDIO_FORMAT;
 }
@@ -236,7 +238,6 @@ static int get_audio_format(int omit)
 static int update_mmd(void)
 {
 	int i;
-	struct stat file_status;
 
 	i = guess_audio_format(mmd->filename);
 	if (i < 0 || get_file_info(i) < 0)
@@ -247,19 +248,15 @@ static int update_mmd(void)
 	mmd->chunks_sent = 0;
 	mmd->current_chunk = 0;
 	mmd->offset = 0;
-	if (fstat(fileno(audio_file), &file_status) == -1)
-		return -E_FSTAT;
-	mmd->size = file_status.st_size;
-	mmd->mtime = file_status.st_mtime;
 	mmd->events++;
-	PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename);
 	return 1;
 }
 
-static void get_song(void)
+static void vss_get_audio_file(void)
 {
 	char **sl = selectors[mmd->selector_num].get_audio_file_list(10);
 	int i;
+	struct stat file_status;
 
 	if (!sl)
 		goto err_out;
@@ -268,27 +265,35 @@ static void get_song(void)
 		PARA_INFO_LOG("trying %s\n", sl[i]);
 		if (strlen(sl[i]) >= _POSIX_PATH_MAX)
 			continue;
-		audio_file = fopen(sl[i], "r");
-		if (!audio_file)
+		audio_file = open(sl[i], O_RDONLY);
+		if (audio_file < 0)
 			continue;
+		if (fstat(audio_file, &file_status) == -1) {
+			close(audio_file);
+			continue;
+		}
+		mmd->size = file_status.st_size;
+		mmd->mtime = file_status.st_mtime;
+		map = para_mmap(file_status.st_size, PROT_READ, MAP_PRIVATE,
+			audio_file, 0);
 		strcpy(mmd->filename, sl[i]);
-		if (update_mmd() < 0) {
-			fclose(audio_file);
-			audio_file = NULL;
+		if (update_mmd() < 0) { /* invalid file */
+			close(audio_file);
+			munmap(map, mmd->size);
+			map = NULL;
 			continue;
 		}
 		mmd->num_played++;
 		if (selectors[mmd->selector_num].update_audio_file)
 			selectors[mmd->selector_num].update_audio_file(sl[i]);
-		PARA_DEBUG_LOG("%s", "success\n");
+		PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename);
 		mmd->new_vss_status_flags &= (~VSS_NEXT);
 		gettimeofday(&now, NULL);
 		tv_add(&now, &announce_tv, &data_send_barrier);
-
 		goto free;
 	}
-	PARA_ERROR_LOG("%s", "no valid files found\n");
 err_out:
+	PARA_ERROR_LOG("%s", "no valid files found\n");
 	mmd->new_vss_status_flags = VSS_NEXT;
 free:
 	if (sl) {
@@ -316,7 +321,7 @@ static void vss_next_chunk_time(struct timeval *due)
 {
 	struct timeval tmp;
 
-	tv_scale(mmd->chunks_sent, &afl[mmd->audio_format].chunk_tv, &tmp);
+	tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp);
 	tv_add(&tmp, &mmd->stream_start, due);
 }
 
@@ -344,7 +349,7 @@ static struct timeval *vss_compute_timeout(void)
 	if (chk_barrier("data send", &now, &data_send_barrier,
 			&the_timeout, 1) < 0)
 		return &the_timeout;
-	if (mmd->audio_format < 0 || !vss_playing() || !audio_file)
+	if (mmd->audio_format < 0 || !vss_playing() || !map)
 		return NULL;
 	vss_next_chunk_time(&next_chunk);
 	if (chk_barrier(afl[mmd->audio_format].name, &now, &next_chunk,
@@ -356,29 +361,33 @@ static struct timeval *vss_compute_timeout(void)
 	return &the_timeout;
 }
 
-static void vss_eof(struct audio_format_handler *af)
+static void vss_eof(void)
 {
 	struct timeval now;
 	int i;
 	char *tmp;
 
-	if (!af || !audio_file) {
+	if (!map) {
 		for (i = 0; senders[i].name; i++)
 			senders[i].shutdown_clients();
 		return;
 	}
 	gettimeofday(&now, NULL);
-	tv_add(&af->eof_tv, &now, &eof_barrier);
-	af->close_audio_file();
-	audio_file = NULL;
+	tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
+	munmap(map, mmd->size);
+	map = NULL;
+	close(audio_file);
 	mmd->audio_format = -1;
-	af = NULL;
 	mmd->chunks_sent = 0;
 	mmd->offset = 0;
-	mmd->seconds_total = 0;
+	mmd->afi.seconds_total = 0;
+	free(mmd->afi.chunk_table);
+	mmd->afi.chunk_table = NULL;
+	free(mmd->afi.header);
+	mmd->afi.header = NULL;
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
 		status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
-	strcpy(mmd->audio_file_info, tmp);
+	strcpy(mmd->afi.info_string, tmp);
 	free(tmp);
 	tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1],
 		status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]);
@@ -401,12 +410,10 @@ static void vss_eof(struct audio_format_handler *af)
  */
 char *vss_get_header(int *header_len)
 {
-	*header_len = 0;
 	if (mmd->audio_format < 0)
 		return NULL;
-	if (!afl[mmd->audio_format].get_header_info)
-		return NULL;
-	return afl[mmd->audio_format].get_header_info(header_len);
+	*header_len = mmd->afi.header_len;
+	return mmd->afi.header;
 }
 
 /**
@@ -431,7 +438,7 @@ struct timeval *vss_chunk_time(void)
 {
 	if (mmd->audio_format < 0)
 		return NULL;
-	return &afl[mmd->audio_format].chunk_tv;
+	return &mmd->afi.chunk_tv;
 }
 
 /**
@@ -464,7 +471,7 @@ again:
 		for (i = 0; senders[i].name; i++)
 			senders[i].shutdown_clients();
 	if (vss_next() && af) {
-		vss_eof(af);
+		vss_eof();
 		return vss_compute_timeout();
 	}
 	if (vss_paused() || vss_repos()) {
@@ -474,7 +481,7 @@ again:
 			struct timeval now;
 			gettimeofday(&now, NULL);
 			if (!vss_paused() || mmd->chunks_sent)
-				tv_add(&af->eof_tv, &now, &eof_barrier);
+				tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
 			if (vss_repos())
 				tv_add(&now, &announce_tv, &data_send_barrier);
 			if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -482,17 +489,15 @@ again:
 		}
 		mmd->chunks_sent = 0;
 	}
-	if (af && vss_repos() && mmd->current_chunk != mmd->repos_request)
-		af->reposition_stream(mmd->repos_request);
 	if (vss_repos()) {
 		mmd->new_vss_status_flags &= ~(VSS_REPOS);
 		mmd->current_chunk = mmd->repos_request;
 	}
 	ret = vss_compute_timeout();
-	if (!ret && !audio_file && vss_playing() &&
+	if (!ret && !map && vss_playing() &&
 			!(mmd->new_vss_status_flags & VSS_NOMORE)) {
 		PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
-		get_song();
+		vss_get_audio_file();
 		goto again;
 	}
 	return ret;
@@ -506,20 +511,15 @@ again:
  * the current audio format handler to obtain a pointer to the data to be
  * sent out as well as its length. This information is then passed to each
  * supported sender's send() function which does the actual sending.
- *
- * Return value: Positive return value on success, zero on eof and negative
- * on errors.
  */
-
 void vss_send_chunk(void)
 {
 	int i;
 	struct audio_format_handler *af;
-	char *buf;
-	ssize_t ret;
+	ssize_t pos, len;
 	struct timeval now, due;
 
-	if (mmd->audio_format < 0 || !audio_file || !vss_playing())
+	if (mmd->audio_format < 0 || !map || !vss_playing())
 		return;
 	af = &afl[mmd->audio_format];
 	gettimeofday(&now, NULL);
@@ -531,25 +531,27 @@ void vss_send_chunk(void)
 	if (chk_barrier("data send", &now, &data_send_barrier,
 			&due, 1) < 0)
 		return;
-	buf = af->read_chunk(mmd->current_chunk, &ret);
 	mmd->new_vss_status_flags &= ~VSS_REPOS;
-	if (!buf) {
-		if (ret < 0)
-			mmd->new_vss_status_flags = VSS_NEXT;
-		else
-			mmd->new_vss_status_flags |= VSS_NEXT;
-		vss_eof(af);
-		return;
+	if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */
+		mmd->new_vss_status_flags |= VSS_NEXT;
+		return vss_eof();
 	}
+	pos = mmd->afi.chunk_table[mmd->current_chunk];
+	len = mmd->afi.chunk_table[mmd->current_chunk + 1] - pos;
+	/*
+	 * We call the send function also in case of empty chunks as they
+  	 * might have still some data queued which can be sent in this case.
+  	 */
 	if (!mmd->chunks_sent) {
 		struct timeval tmp;
 		gettimeofday(&mmd->stream_start, NULL);
-		tv_scale(mmd->current_chunk, &af->chunk_tv, &tmp);
+		tv_scale(mmd->current_chunk, &mmd->afi.chunk_tv, &tmp);
 		mmd->offset = tv2ms(&tmp);
 		mmd->events++;
 	}
 	for (i = 0; senders[i].name; i++)
-		senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, ret);
+		senders[i].send(mmd->current_chunk, mmd->chunks_sent,
+			map + pos, len);
 	mmd->new_vss_status_flags |= VSS_PLAYING;
 	mmd->chunks_sent++;
 	mmd->current_chunk++;