X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=89e06c92beb5b934b567cc48b93a91081d433931;hp=5d919f73b5b47b0cce1db5948c1f4ae6ef6b7a32;hb=73aebb78da7297053f41dba5b3f0cefb33ad248e;hpb=a87b707988a472eded0546e83180af2c11ff931f diff --git a/vss.c b/vss.c index 5d919f73..89e06c92 100644 --- a/vss.c +++ b/vss.c @@ -1,10 +1,10 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file vss.c the virtual streaming system +/** \file vss.c The virtual streaming system. * * This contains the audio streaming code of para_server which is independent * of the current audio format, audio file selector and of the activated @@ -24,90 +24,25 @@ #include "server.h" #include "net.h" #include "server.cmdline.h" -#include "afs_common.h" #include "vss.h" #include "send.h" #include "ipc.h" #include "fd.h" -extern const char *status_item_list[]; - static struct timeval announce_tv; static struct timeval data_send_barrier; static struct timeval eof_barrier; static struct timeval autoplay_barrier; extern struct misc_meta_data *mmd; -extern struct audio_file_selector selectors[]; extern struct sender senders[]; -static int audio_file; static char *map; -/* 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 *); -#endif -#ifdef HAVE_FAAD - void aac_afh_init(struct audio_format_handler *); -#endif - -/** - * 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[] = { - { - .name = "mp3", - .init = mp3_init, - }, - { - .name = "ogg", -#ifdef HAVE_OGGVORBIS - .init = ogg_init, -#endif - }, - { - .name = "aac", -#ifdef HAVE_FAAD - .init = aac_afh_init, -#endif - }, - { - .name = NULL, - } -}; - -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 + * Check if vss status flag \a P (playing) is set. * - * \return greater than zero if playing, zero otherwise. + * \return Greater than zero if playing, zero otherwise. * */ unsigned int vss_playing(void) @@ -116,9 +51,9 @@ unsigned int vss_playing(void) } /** - * check if \a N (next) status flag is set + * Check if the \a N (next) status flag is set. * - * \return greater than zero if set, zero if not. + * \return Greater than zero if set, zero if not. * */ unsigned int vss_next(void) @@ -127,9 +62,9 @@ unsigned int vss_next(void) } /** - * check if a reposition request is pending + * Check if a reposition request is pending. * - * \return greater than zero if true, zero otherwise. + * \return Greater than zero if true, zero otherwise. * */ unsigned int vss_repos(void) @@ -138,9 +73,9 @@ unsigned int vss_repos(void) } /** - * check if the vss is currently paused + * Check if the vss is currently paused. * - * \return greater than zero if paused, zero otherwise. + * \return Greater than zero if paused, zero otherwise. * */ unsigned int vss_paused(void) @@ -150,25 +85,22 @@ unsigned int vss_paused(void) } /** - * Get the name of the given audio format. + * Check if the vss is currently stopped. * - * \param i The audio format number. + * \return Greater than zero if paused, zero otherwise. * - * This returns a pointer to statically allocated memory so it - * must not be freed by the caller. */ -const char *audio_format_name(int i) +unsigned int vss_stopped(void) { - //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)"; + return (mmd->new_vss_status_flags & VSS_NEXT) + && !(mmd->new_vss_status_flags & VSS_PLAYING); } /** - * initialize the virtual streaming system + * Initialize the virtual streaming system. * - * Call the init functions of all supported audio format handlers and - * initialize all supported senders. + * This also initializes all supported senders and starts streaming + * if the --autoplay command line flag was given. */ void vss_init(void) { @@ -178,14 +110,6 @@ void vss_init(void) 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_EACH_AUDIO_FORMAT(i) { - PARA_NOTICE_LOG("initializing %s handler\n", - audio_format_name(i)); - afl[i].init(&afl[i]); - } ms2tv(announce_time, &announce_tv); PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv)); for (i = 0; senders[i].name; i++) { @@ -204,75 +128,6 @@ void vss_init(void) } } -/** - * guess the audio format judging from filename - * - * \param name the filename - * - * \return This function returns -1 if it has no idea what kind of audio - * file this might be. Otherwise the (non-negative) number of the audio format - * is returned. - */ -int guess_audio_format(const char *name) -{ - int i,j, len = strlen(name); - - FOR_EACH_AUDIO_FORMAT(i) { - for (j = 0; afl[i].suffixes[j]; j++) { - const char *p = afl[i].suffixes[j]; - int plen = strlen(p); - if (len < plen + 1) - continue; - if (name[len - plen - 1] != '.') - continue; - if (strcasecmp(name + len - plen, p)) - continue; -// PARA_DEBUG_LOG("might be %s\n", audio_format_name(i)); - return i; - } - } - return -E_BAD_AUDIO_FILE_SUFFIX; -} - -/** - * 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 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 == format) /* we already tried this one to no avail */ - continue; - ret = afl[i].get_file_info(data, size, afhi); - if (ret >= 0) - return i; - PARA_WARNING_LOG("%s\n", PARA_STRERROR(-ret)); - } - return -E_AUDIO_FORMAT; -} - static int chk_barrier(const char *bname, const struct timeval *now, const struct timeval *barrier, struct timeval *diff, int print_log) @@ -291,7 +146,7 @@ static void vss_next_chunk_time(struct timeval *due) { struct timeval tmp; - tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp); + tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp); tv_add(&tmp, &mmd->stream_start, due); } @@ -304,7 +159,7 @@ static struct timeval *vss_compute_timeout(void) static struct timeval the_timeout; struct timeval now, next_chunk; - if (vss_next() && mmd->audio_format >= 0) { + if (vss_next() && map) { /* only sleep a bit, nec*/ the_timeout.tv_sec = 0; the_timeout.tv_usec = 100; @@ -319,11 +174,10 @@ 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() || !map) + if (!vss_playing() || !map) return NULL; vss_next_chunk_time(&next_chunk); - if (chk_barrier(audio_format_name(mmd->audio_format), &now, &next_chunk, - &the_timeout, 0) < 0) + if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0) return &the_timeout; /* chunk is due or bof */ the_timeout.tv_sec = 0; @@ -337,32 +191,29 @@ static void vss_eof(void) int i; char *tmp; - PARA_NOTICE_LOG("EOF\n"); if (!map) { for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); return; } + if (mmd->new_vss_status_flags & VSS_NOMORE) + mmd->new_vss_status_flags = VSS_NEXT; gettimeofday(&now, NULL); - tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); + tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier); munmap(map, mmd->size); map = NULL; - close(audio_file); - mmd->audio_format = -1; mmd->chunks_sent = 0; mmd->offset = 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->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]); - strcpy(mmd->selector_info, tmp); + mmd->afd.afhi.seconds_total = 0; + free(mmd->afd.afhi.chunk_table); + mmd->afd.afhi.chunk_table = NULL; + tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO], + status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]); + strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string)); + mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0'; + make_empty_status_items(mmd->afd.verbose_ls_output); free(tmp); - mmd->filename[0] = '\0'; + mmd->mtime = 0; mmd->size = 0; mmd->events++; } @@ -370,25 +221,25 @@ static void vss_eof(void) /** * Get the header of the current audio file. * - * \param header_len the length of the header is stored here + * \param header_len The length of the header is stored here. * - * \return a pointer to a buffer containing the header, or NULL, if no audio + * \return A pointer to a buffer containing the header, or NULL, if no audio * file is selected or if the current audio format does not need special header * treamtment. * */ char *vss_get_header(size_t *header_len) { - if (mmd->audio_format < 0 || !map || !mmd->afi.header_len) + if (!map || !mmd->afd.afhi.header_len) return NULL; - *header_len = mmd->afi.header_len; - return map + mmd->afi.header_offset; + *header_len = mmd->afd.afhi.header_len; + return map + mmd->afd.afhi.header_offset; } /** - * get the list of all supported audio formats + * Get the list of all supported audio formats. * - * \return a space separated list of all supported audio formats + * \return Aa space separated list of all supported audio formats * It is not allocated at runtime, i.e. there is no need to free * the returned string in the caller. */ @@ -398,21 +249,25 @@ const char *supported_audio_formats(void) } /** - * get the chunk time of the current audio file + * Get the chunk time of the current audio file. * - * \return a pointer to a struct containing the chunk time, or NULL, + * \return A pointer to a struct containing the chunk time, or NULL, * if currently no audio file is selected. */ struct timeval *vss_chunk_time(void) { - if (mmd->audio_format < 0) + if (!map) return NULL; - return &mmd->afi.chunk_tv; + return &mmd->afd.afhi.chunk_tv; } +/** The possible states of the afs socket. See \ref afs_socket. */ enum afs_socket_status { + /** Socket is inactive. */ AFS_SOCKET_READY, + /** Socket fd was included in the write fd set for select(). */ AFS_SOCKET_CHECK_FOR_WRITE, + /** vss wrote a request to the socket and waits for afs to reply. */ AFS_SOCKET_AFD_PENDING }; @@ -424,6 +279,10 @@ static enum afs_socket_status afsss; * This function gets called from para_server to determine the timeout value * for its main select loop. * + * \param rfds The set of file descriptors to be checked for reading. + * \param wfds The set of file descriptors to be checked for writing. + * \param max_fileno The highest-numbered file descriptor. + * * Before the timeout is computed, the current vss status flags are evaluated * and acted upon by calling appropriate functions from the lower layers. * Possible actions include @@ -457,11 +316,9 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) struct timeval now; gettimeofday(&now, NULL); if (!vss_paused() || mmd->chunks_sent) - tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); + tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier); if (vss_repos()) tv_add(&now, &announce_tv, &data_send_barrier); - if (mmd->new_vss_status_flags & VSS_NOMORE) - mmd->new_vss_status_flags = VSS_NEXT; } mmd->chunks_sent = 0; } @@ -474,8 +331,9 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) 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"); - if (afsss == AFS_SOCKET_READY) { + if (afsss == AFS_SOCKET_READY || + afsss == AFS_SOCKET_CHECK_FOR_WRITE) { + PARA_DEBUG_LOG("ready and playing, but no audio file\n"); para_fd_set(afs_socket, wfds, max_fileno); afsss = AFS_SOCKET_CHECK_FOR_WRITE; } @@ -491,6 +349,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) struct iovec iov; int ret = 0; + *fd = -1; iov.iov_base = buf; iov.iov_len = sizeof(buf); msg.msg_iov = &iov; @@ -501,11 +360,11 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) ret = recvmsg(afs_socket, &msg, 0); if (ret < 0) return -ERRNO_TO_PARA_ERROR(errno); + afsss = AFS_SOCKET_READY; 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) @@ -519,30 +378,29 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) static void recv_afs_result(void) { - int ret, passed_fd = -1, shmid; + int ret, passed_fd, 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; + PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code, + afs_data); + ret = -E_NOFD; if (afs_code != NEXT_AUDIO_FILE) goto err; - afsss = AFS_SOCKET_READY; + if (passed_fd < 0) + goto err; 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) { + PARA_ERROR_LOG("fstat error:\n"); ret = -ERRNO_TO_PARA_ERROR(errno); goto err; } @@ -550,15 +408,12 @@ static void recv_afs_result(void) 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; + close(passed_fd); 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); @@ -566,7 +421,8 @@ static void recv_afs_result(void) err: if (passed_fd >= 0) close(passed_fd); - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + mmd->new_vss_status_flags = VSS_NEXT; } void vss_post_select(fd_set *rfds, fd_set *wfds) @@ -577,20 +433,16 @@ void vss_post_select(fd_set *rfds, fd_set *wfds) recv_afs_result(); if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds)) return; - PARA_NOTICE_LOG("requesting new socket\n"); + PARA_NOTICE_LOG("requesting new fd from afs\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]; + size_t pos = mmd->afd.afhi.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); + *len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos; } /** @@ -600,26 +452,26 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) * \param buf Chunk data. * \param len Chunk length in bytes. * - * \return Positive on success, negative on errors. + * \return Standard. */ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) { - if (mmd->audio_format < 0 || !map || !vss_playing()) + if (!map || !vss_playing()) return -E_CHUNK; - if (chunk_num >= mmd->afi.chunks_total) + if (chunk_num >= mmd->afd.afhi.chunks_total) return -E_CHUNK; get_chunk(chunk_num, buf, len); return 1; } /** - * main sending function + * Main sending function. * - * This function gets called from para_server as soon as the next chunk of - * data should be pushed out. It first calls the read_chunk() function of - * 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. + * This function gets called from para_server as soon as the next chunk of data + * should be pushed out. It obtains a pointer to the data to be sent out as + * well as its length from mmd->afd.afhi. This information is then passed to + * each supported sender's send() function which is supposed to send out the data + * to all connected clients. */ void vss_send_chunk(void) { @@ -628,7 +480,7 @@ void vss_send_chunk(void) char *buf; size_t len; - if (mmd->audio_format < 0 || !map || !vss_playing()) + if (!map || !vss_playing()) return; gettimeofday(&now, NULL); vss_next_chunk_time(&due); @@ -640,7 +492,7 @@ void vss_send_chunk(void) &due, 1) < 0) return; mmd->new_vss_status_flags &= ~VSS_REPOS; - if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */ + if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ mmd->new_vss_status_flags |= VSS_NEXT; return vss_eof(); } @@ -651,7 +503,7 @@ void vss_send_chunk(void) if (!mmd->chunks_sent) { struct timeval tmp; gettimeofday(&mmd->stream_start, NULL); - tv_scale(mmd->current_chunk, &mmd->afi.chunk_tv, &tmp); + tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp); mmd->offset = tv2ms(&tmp); mmd->events++; }