X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=e1e4ead542519ade73e2e5122a54cd4ba44fc7a4;hp=d0b21da2f0072ba17ec2367ec38ef1a2ec97d972;hb=2bca38fbb97e6c5371591eb754b79cc12525aba0;hpb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9 diff --git a/vss.c b/vss.c index d0b21da2..e1e4ead5 100644 --- a/vss.c +++ b/vss.c @@ -18,11 +18,13 @@ /** \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 /* mmap */ #include /* gettimeofday */ #include "server.cmdline.h" #include "afs.h" @@ -42,10 +44,9 @@ static struct timeval autoplay_barrier; extern struct misc_meta_data *mmd; extern struct audio_file_selector selectors[]; extern struct sender senders[]; -static char *inbuf; -static size_t inbuf_size; -static FILE *audio_file = NULL; +static int audio_file; +static char *map; #if 1 void mp3_init(struct audio_format_handler *); @@ -157,6 +158,10 @@ void vss_init(void) { int i; char *hn = para_hostname(), *home = para_homedir(); + long unsigned announce_time = conf.announce_time_arg > 0? + conf.announce_time_arg : 300, + autoplay_delay = conf.autoplay_delay_arg > 0? + conf.autoplay_delay_arg : 0; PARA_DEBUG_LOG("supported audio formats: %s\n", SUPPORTED_AUDIO_FORMATS); @@ -165,7 +170,7 @@ void vss_init(void) afl[i].name); afl[i].init(&afl[i]); } - ms2tv(conf.announce_time_arg, &announce_tv); + ms2tv(announce_time, &announce_tv); PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv)); for (i = 0; senders[i].name; i++) { PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name); @@ -178,14 +183,14 @@ void vss_init(void) mmd->vss_status_flags |= VSS_PLAYING; mmd->new_vss_status_flags |= VSS_PLAYING; gettimeofday(&now, NULL); - ms2tv(conf.autoplay_delay_arg, &tmp); + ms2tv(autoplay_delay, &tmp); tv_add(&now, &tmp, &autoplay_barrier); } } static int get_file_info(int i) { - return afl[i].get_file_info(audio_file, &mmd->afi); + return afl[i].get_file_info(map, mmd->size, &mmd->afi); } /** @@ -225,10 +230,8 @@ static int get_audio_format(int omit) FOR_EACH_AUDIO_FORMAT(i) { if (i == omit) continue; - rewind(audio_file); if (get_file_info(i) > 0) return i; - rewind(audio_file); } return -E_AUDIO_FORMAT; } @@ -239,7 +242,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) @@ -250,19 +252,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; @@ -271,27 +269,37 @@ 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 || + !file_status.st_size) { + close(audio_file); continue; + } + mmd->size = file_status.st_size; + mmd->mtime = file_status.st_mtime; + map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, + audio_file, 0); strcpy(mmd->filename, sl[i]); - if (update_mmd() < 0) { - fclose(audio_file); - audio_file = NULL; + mmd->afi.header_len = 0; /* default: no header */ + 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) { @@ -347,7 +355,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, @@ -359,31 +367,28 @@ 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(&mmd->afi.eof_tv, &now, &eof_barrier); - af->close_audio_file(); - audio_file = NULL; + munmap(map, mmd->size); + map = NULL; + close(audio_file); mmd->audio_format = -1; - af = NULL; mmd->chunks_sent = 0; mmd->offset = 0; mmd->afi.seconds_total = 0; free(mmd->afi.chunk_table); mmd->afi.chunk_table = NULL; - PARA_ERROR_LOG("freeing header %p\n", mmd->afi.header); - 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->afi.info_string, tmp); @@ -407,12 +412,12 @@ static void vss_eof(struct audio_format_handler *af) * treamtment. * */ -char *vss_get_header(int *header_len) +char *vss_get_header(unsigned *header_len) { - if (mmd->audio_format < 0) + if (mmd->audio_format < 0 || !map || !mmd->afi.header_len) return NULL; *header_len = mmd->afi.header_len; - return mmd->afi.header; + return map + mmd->afi.header_offset; } /** @@ -470,7 +475,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()) { @@ -493,49 +498,15 @@ again: 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; } -/** - * read a chunk of data from the current audio file - * - * \param current_chunk the chunk number to read - * - * \return The length of the chunk on success, zero on end of file, negative on - * errors. Note: If the current chunk is of length zero, but the end of the - * file is not yet reached, this function returns -E_EMPTY_CHUNK. - * */ -ssize_t vss_read_chunk(void) -{ - ssize_t len; - size_t pos; - int ret; - long unsigned cc = mmd->current_chunk; - - if (cc >= mmd->afi.chunks_total) /* eof */ - return 0; - len = mmd->afi.chunk_table[cc + 1] - mmd->afi.chunk_table[cc]; - if (!len) /* nothing to send for this run */ - return -E_EMPTY_CHUNK; - pos = mmd->afi.chunk_table[cc]; - if (inbuf_size < len) { - PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zu bytes\n", - cc, mmd->afi.chunks_total, len); - inbuf = para_realloc(inbuf, len); - inbuf_size = len; - } - ret = para_fseek(audio_file, pos, SEEK_SET); - if (ret < 0) - return ret; - return para_fread(inbuf, len, 1, audio_file); -} - /** * main sending function * @@ -544,18 +515,16 @@ ssize_t vss_read_chunk(void) * 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; - ssize_t ret; + ssize_t pos; + size_t 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); @@ -567,23 +536,17 @@ void vss_send_chunk(void) if (chk_barrier("data send", &now, &data_send_barrier, &due, 1) < 0) return; - ret= vss_read_chunk(); mmd->new_vss_status_flags &= ~VSS_REPOS; - if (!ret || (ret < 0 && ret != -E_EMPTY_CHUNK)) { - if (ret < 0) { - mmd->new_vss_status_flags = VSS_NEXT; - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - } 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 (ret < 0) - ret = 0; if (!mmd->chunks_sent) { struct timeval tmp; gettimeofday(&mmd->stream_start, NULL); @@ -592,7 +555,8 @@ void vss_send_chunk(void) mmd->events++; } for (i = 0; senders[i].name; i++) - senders[i].send(mmd->current_chunk, mmd->chunks_sent, inbuf, 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++;