X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=5415929bde788fffc9de6297d23bb1cde1f29ad6;hp=4a395593f3aa1a6a5038b3d3c23330c6b0ea5610;hb=5913ef464aff461a76f3656916265d81de91a9ae;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921 diff --git a/vss.c b/vss.c index 4a395593..5415929b 100644 --- a/vss.c +++ b/vss.c @@ -1,36 +1,34 @@ /* * Copyright (C) 1997-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \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 "db.h" +#include +#include + +#include "para.h" +#include "error.h" +#include "string.h" #include "afh.h" +#include "afs.h" +#include "server.h" +#include "net.h" +#include "server.cmdline.h" +#include "afs_common.h" #include "vss.h" #include "send.h" -#include "error.h" -#include "string.h" +#include "ipc.h" +#include "fd.h" extern const char *status_item_list[]; @@ -43,11 +41,11 @@ 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 *); -#endif +/* The mp3 audio format handler does not need any libs. */ +void mp3_init(struct audio_format_handler *); #ifdef HAVE_OGGVORBIS void ogg_init(struct audio_format_handler *); @@ -57,34 +55,54 @@ static FILE *audio_file = NULL; #endif /** - * the list of supported audio formats + * The list of supported audio formats. + * + * We always define the full array of audio formats even if some audio formats + * were not compiled in. This is because for each audio file the number of its + * audio format is stored in the databse. We don't want that numbers to become + * stale just because the user installed a new version of paraslash that + * supports a different set of audio formats. + * + * It can still be easily detected whether an audio format is compiled in by + * checking if the init function pointer is not \p NULL. */ static struct audio_format_handler afl[] = { -#if 1 { .name = "mp3", .init = mp3_init, }, -#endif -#ifdef HAVE_OGGVORBIS { .name = "ogg", +#ifdef HAVE_OGGVORBIS .init = ogg_init, - }, #endif -#ifdef HAVE_FAAD + }, { .name = "aac", +#ifdef HAVE_FAAD .init = aac_afh_init, - }, #endif + }, { .name = NULL, } }; -/** iterate over each supported audio format */ -#define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++) +static inline int next_audio_format(int format) +{ + for (;;) { + if (!afl[format].name) + return format; + format++; + if (afl[format].init) + return format; + } + +} + +/** Iterate over each supported audio format. */ +#define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i = next_audio_format(i)) + /** * check if vss status flag \a P (playing) is set @@ -132,14 +150,17 @@ unsigned int vss_paused(void) } /** - * get the name of the given audio format - * \param i the audio format number + * Get the name of the given audio format. + * + * \param i The audio format number. * * This returns a pointer to statically allocated memory so it * must not be freed by the caller. */ const char *audio_format_name(int i) { + //PARA_NOTICE_LOG("array size: %u¸ requested: %d\n", ARRAY_SIZE(afl), i); + assert(i < 0 || i < ARRAY_SIZE(afl) - 1); return i >= 0? afl[i].name : "(none)"; } @@ -153,15 +174,19 @@ 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); - for (i = 0; afl[i].name; i++) { + FOR_EACH_AUDIO_FORMAT(i) { PARA_NOTICE_LOG("initializing %s handler\n", 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); @@ -174,17 +199,11 @@ 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->audio_file_info, - &mmd->chunks_total, &mmd->seconds_total); -} - /** * guess the audio format judging from filename * @@ -212,92 +231,48 @@ int guess_audio_format(const char *name) return i; } } - return -1; + return -E_BAD_AUDIO_FILE_SUFFIX; } -static int get_audio_format(int omit) +/** + * Call get_file_info() to obtain an afhi structure. + * + * \param path The full path of the audio file. + * \param data Pointer to the contents of the (mapped) file. + * \param size The file size in bytes. + * \param afhi Result pointer. + * + * \return The number of the audio format on success, \p -E_AUDIO_FORMAT if no + * compiled in audio format handler is able to handler the file. + * + * This function tries to find an audio format handler that can interpret the + * file given by \a data and \a size. + * + * It first tries to determine the audio format from the filename given by \a + * path. If this doesn't work, all other audio format handlers are tried until + * one is found that can handle the file. + */ +int compute_afhi(const char *path, char *data, size_t size, + struct audio_format_info *afhi) { - int i; + int ret, i, format = guess_audio_format(path); + if (format >= 0) { + ret = afl[format].get_file_info(data, size, afhi); + if (ret >= 0) + return format; + } FOR_EACH_AUDIO_FORMAT(i) { - if (i == omit || !afl[i].get_file_info) + if (i == format) /* we already tried this one to no avail */ continue; - rewind(audio_file); - if (get_file_info(i) > 0) + ret = afl[i].get_file_info(data, size, afhi); + if (ret >= 0) return i; - rewind(audio_file); + PARA_WARNING_LOG("%s\n", PARA_STRERROR(-ret)); } return -E_AUDIO_FORMAT; } -/* - * upddate shared mem - */ -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) - i = get_audio_format(i); - if (i < 0) - return i; - mmd->audio_format = i; - 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) -{ - char **sl = selectors[mmd->selector_num].get_audio_file_list(10); - int i; - - if (!sl) - goto err_out; - for (i = 0; sl[i]; i++) { - struct timeval now; - 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) - continue; - strcpy(mmd->filename, sl[i]); - if (update_mmd() < 0) { - fclose(audio_file); - audio_file = 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"); - 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: - mmd->new_vss_status_flags = VSS_NEXT; -free: - if (sl) { - for (i = 0; sl[i]; i++) - free(sl[i]); - free(sl); - } -} - static int chk_barrier(const char *bname, const struct timeval *now, const struct timeval *barrier, struct timeval *diff, int print_log) @@ -316,7 +291,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 +319,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 +331,32 @@ 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) { + PARA_NOTICE_LOG("EOF\n"); + 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; 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]); @@ -390,7 +368,7 @@ static void vss_eof(struct audio_format_handler *af) } /** - * get the header and of the current audio file + * Get the header of the current audio file. * * \param header_len the length of the header is stored here * @@ -399,14 +377,12 @@ static void vss_eof(struct audio_format_handler *af) * treamtment. * */ -char *vss_get_header(int *header_len) +char *vss_get_header(size_t *header_len) { - *header_len = 0; - if (mmd->audio_format < 0) - return NULL; - if (!afl[mmd->audio_format].get_header_info) + if (mmd->audio_format < 0 || !map || !mmd->afi.header_len) return NULL; - return afl[mmd->audio_format].get_header_info(header_len); + *header_len = mmd->afi.header_len; + return map + mmd->afi.header_offset; } /** @@ -431,11 +407,19 @@ 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; } +enum afs_socket_status { + AFS_SOCKET_READY, + AFS_SOCKET_CHECK_FOR_WRITE, + AFS_SOCKET_AFD_PENDING +}; + +static enum afs_socket_status afsss; + /** - * compute the timeout for para_server's main select-loop + * Compute the timeout for para_server's main select-loop. * * This function gets called from para_server to determine the timeout value * for its main select loop. @@ -444,37 +428,36 @@ struct timeval *vss_chunk_time(void) * and acted upon by calling appropriate functions from the lower layers. * Possible actions include * - * - request a new file list from the current audio file selector - * - shutdown of all senders (stop/pause command) - * - reposition the stream (ff/jmp command) + * - request a new audio file from afs, + * - shutdown of all senders (stop/pause command), + * - reposition the stream (ff/jmp command). * * \return A pointer to a struct timeval containing the timeout for the next * chunk of data to be sent, or NULL if we're not sending right now. */ -struct timeval *vss_preselect(void) +struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) { - struct audio_format_handler *af = NULL; - int i, format; - struct timeval *ret; -again: - format = mmd->audio_format; - if (format >= 0) - af = afl + format; - else + int i; + struct timeval *tv; + + para_fd_set(afs_socket, rfds, max_fileno); + if (!map) for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); - if (vss_next() && af) { - vss_eof(af); - return vss_compute_timeout(); + else { + if (vss_next()) { + vss_eof(); + return vss_compute_timeout(); + } } if (vss_paused() || vss_repos()) { for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); - if (af) { + if (map) { 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,20 +465,151 @@ 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() && + tv = vss_compute_timeout(); + if (tv) + return tv; + if (!map && vss_playing() && !(mmd->new_vss_status_flags & VSS_NOMORE)) { PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n"); - get_song(); - goto again; + if (afsss == AFS_SOCKET_READY) { + para_fd_set(afs_socket, wfds, max_fileno); + afsss = AFS_SOCKET_CHECK_FOR_WRITE; + } + } + return tv; +} + +static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) +{ + char control[255], buf[8]; + struct msghdr msg = {.msg_iov = NULL}; + struct cmsghdr *cmsg; + struct iovec iov; + int ret = 0; + + iov.iov_base = buf; + iov.iov_len = sizeof(buf); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = control; + msg.msg_controllen = sizeof(control); + memset(buf, 0, sizeof(buf)); + ret = recvmsg(afs_socket, &msg, 0); + if (ret < 0) + return -ERRNO_TO_PARA_ERROR(errno); + if (iov.iov_len != sizeof(buf)) + return -E_SHORT_AFS_READ; + *code = *(uint32_t*)buf; + *data = *(uint32_t*)(buf + 4); + cmsg = CMSG_FIRSTHDR(&msg); + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { + if (cmsg->cmsg_level != SOL_SOCKET + || cmsg->cmsg_type != SCM_RIGHTS) + continue; + if ((cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int) != 1) + continue; + *fd = *(int *)CMSG_DATA(cmsg); + } + return 1; +} + +static void recv_afs_result(void) +{ + int ret, passed_fd = -1, shmid; + uint32_t afs_code = 0, afs_data = 0; + struct stat statbuf; + struct timeval now; + + PARA_NOTICE_LOG("recv\n"); + ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data); + if (ret < 0) + goto err; + PARA_NOTICE_LOG("got the fd: %d, code: %u, shmid: %u\n", + passed_fd, afs_code, afs_data); + ret = -E_BAD_AFS_CODE; + if (afs_code != NEXT_AUDIO_FILE) + goto err; + afsss = AFS_SOCKET_READY; + shmid = afs_data; + ret = load_afd(shmid, &mmd->afd); + if (ret < 0) + goto err; + shm_destroy(shmid); + PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path, + mmd->afd.afhi.chunks_total); + ret = fstat(passed_fd, &statbuf); + if (ret < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err; } - return ret; + mmd->size = statbuf.st_size; + mmd->mtime = statbuf.st_mtime; + map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, + passed_fd, 0); + strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */ + mmd->afi.header_len = 0; /* default: no header */ + mmd->audio_format = mmd->afd.afsi.audio_format_id; + mmd->chunks_sent = 0; + mmd->current_chunk = 0; + mmd->offset = 0; + mmd->events++; + mmd->num_played++; + mmd->afi = mmd->afd.afhi; + mmd->new_vss_status_flags &= (~VSS_NEXT); + gettimeofday(&now, NULL); + tv_add(&now, &announce_tv, &data_send_barrier); + return; +err: + if (passed_fd >= 0) + close(passed_fd); + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); +} + +void vss_post_select(fd_set *rfds, fd_set *wfds) +{ + int ret; + + if (FD_ISSET(afs_socket, rfds)) + recv_afs_result(); + if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds)) + return; + PARA_NOTICE_LOG("requesting new socket\n"); + ret = send_buffer(afs_socket, "new"); + afsss = AFS_SOCKET_AFD_PENDING; +} + +static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) +{ + size_t pos = mmd->afi.chunk_table[chunk_num]; + *buf = map + pos; + *len = mmd->afi.chunk_table[chunk_num + 1] - pos; + + if (chunk_num + 5 > mmd->afd.afhi.chunks_total) + PARA_NOTICE_LOG("chunk %lu/%lu\n, len: %zu\n", chunk_num, + mmd->afd.afhi.chunks_total, *len); +} + +/** + * Get the data of the given chunk. + * + * \param chunk_num The number of the desired chunk. + * \param buf Chunk data. + * \param len Chunk length in bytes. + * + * \return Positive on success, negative on errors. + */ +int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) +{ + if (mmd->audio_format < 0 || !map || !vss_playing()) + return -E_CHUNK; + if (chunk_num >= mmd->afi.chunks_total) + return -E_CHUNK; + get_chunk(chunk_num, buf, len); + return 1; } /** @@ -506,22 +620,16 @@ 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; struct timeval now, due; + char *buf; + size_t len; - 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); vss_next_chunk_time(&due); if (tv_diff(&due, &now, NULL) > 0) @@ -531,25 +639,25 @@ 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(); } + /* + * 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++; } + get_chunk(mmd->current_chunk, &buf, &len); 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, buf, len); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;