X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=93ee76d7377e69a4a84223459d301f694e20da48;hp=82dff47ed73c5971a8d7662e777dbb8c9c034e75;hb=9e0bf2caf0500aef978abfb50f8c8111bb1d9831;hpb=e6f65525fb59ceec8407020dc882118968294cb3 diff --git a/vss.c b/vss.c index 82dff47e..93ee76d7 100644 --- a/vss.c +++ b/vss.c @@ -24,7 +24,6 @@ #include "server.h" #include "net.h" #include "server.cmdline.h" -#include "afs_common.h" #include "vss.h" #include "send.h" #include "ipc.h" @@ -38,72 +37,10 @@ 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 * @@ -149,21 +86,6 @@ unsigned int vss_paused(void) && !(mmd->new_vss_status_flags & VSS_PLAYING); } -/** - * 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)"; -} - /** * initialize the virtual streaming system * @@ -178,14 +100,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", - afl[i].name); - 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 +118,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) @@ -322,7 +167,7 @@ static struct timeval *vss_compute_timeout(void) 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, + if (chk_barrier(audio_format_name(mmd->audio_format), &now, &next_chunk, &the_timeout, 0) < 0) return &the_timeout; /* chunk is due or bof */ @@ -337,6 +182,7 @@ 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(); @@ -346,7 +192,6 @@ static void vss_eof(void) tv_add(&mmd->afi.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; @@ -357,10 +202,6 @@ static void vss_eof(void) 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); - free(tmp); mmd->filename[0] = '\0'; mmd->size = 0; mmd->events++; @@ -418,7 +259,7 @@ enum afs_socket_status { 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. @@ -427,36 +268,32 @@ static enum afs_socket_status afsss; * 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(fd_set *rfds, fd_set *wfds, int *max_fileno) { - struct audio_format_handler *af = NULL; - int i, format; - struct timeval *ret; + int i; + struct timeval *tv; para_fd_set(afs_socket, rfds, max_fileno); - -//again: - format = mmd->audio_format; - if (format >= 0) - af = afl + format; - else + if (!map) for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); - if (vss_next() && af) { - vss_eof(); - 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) @@ -472,18 +309,18 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno) mmd->new_vss_status_flags &= ~(VSS_REPOS); mmd->current_chunk = mmd->repos_request; } - ret = vss_compute_timeout(); - if (!ret && !map && 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"); - //vss_get_audio_file(); if (afsss == AFS_SOCKET_READY) { para_fd_set(afs_socket, wfds, max_fileno); afsss = AFS_SOCKET_CHECK_FOR_WRITE; } -// goto again; } - return ret; + return tv; } static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data) @@ -527,6 +364,7 @@ static void recv_afs_result(void) 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; @@ -545,6 +383,7 @@ static void recv_afs_result(void) 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; } @@ -552,6 +391,7 @@ static void recv_afs_result(void) mmd->mtime = statbuf.st_mtime; map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, passed_fd, 0); + close(passed_fd); 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; @@ -579,6 +419,7 @@ 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"); ret = send_buffer(afs_socket, "new"); afsss = AFS_SOCKET_AFD_PENDING; } @@ -588,6 +429,10 @@ 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); } /** @@ -621,12 +466,12 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) void vss_send_chunk(void) { int i; - struct audio_format_handler *af; struct timeval now, due; + char *buf; + size_t len; 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) @@ -652,12 +497,9 @@ void vss_send_chunk(void) mmd->offset = tv2ms(&tmp); mmd->events++; } - for (i = 0; senders[i].name; i++) { - char *buf; - size_t len; - get_chunk(mmd->current_chunk, &buf, &len); + get_chunk(mmd->current_chunk, &buf, &len); + for (i = 0; senders[i].name; i++) senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len); - } mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;