/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
*
- * 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
+/** \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 <sys/types.h>
+#include <dirent.h>
+
+#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 "vss.h"
+#include "list.h"
#include "send.h"
-#include "error.h"
-#include "string.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 char *inbuf;
-static size_t inbuf_size;
-static FILE *audio_file = NULL;
+extern void dccp_send_init(struct sender *);
+extern void http_send_init(struct sender *);
+extern void ortp_send_init(struct sender *);
-#if 1
- void mp3_init(struct audio_format_handler *);
-#endif
-
-#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
- */
-static struct audio_format_handler afl[] = {
-#if 1
+/** the list of supported senders */
+struct sender senders[] = {
{
- .name = "mp3",
- .init = mp3_init,
+ .name = "http",
+ .init = http_send_init,
},
-#endif
-#ifdef HAVE_OGGVORBIS
{
- .name = "ogg",
- .init = ogg_init,
+ .name = "dccp",
+ .init = dccp_send_init,
},
-#endif
-#ifdef HAVE_FAAD
+#ifdef HAVE_ORTP
{
- .name = "aac",
- .init = aac_afh_init,
+ .name = "ortp",
+ .init = ortp_send_init,
},
#endif
{
}
};
-/** iterate over each supported audio format */
-#define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++)
+static char *map;
/**
- * 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)
}
/**
- * 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)
}
/**
- * 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)
}
/**
- * 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)
}
/**
- * get the name of the given audio format
- * \param i the audio format number
+ * Check if the vss is currently stopped.
+ *
+ * \return Greater than zero if paused, zero otherwise.
+ *
+ */
+unsigned int vss_stopped(void)
+{
+ return (mmd->new_vss_status_flags & VSS_NEXT)
+ && !(mmd->new_vss_status_flags & VSS_PLAYING);
+}
+
+/**
+ * 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.
*
- * This returns a pointer to statically allocated memory so it
- * must not be freed by the caller.
+ * \return Standard.
*/
-const char *audio_format_name(int i)
+int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
{
- return i >= 0? afl[i].name : "(none)";
+ if (!map || !vss_playing())
+ return -E_CHUNK;
+ if (chunk_num >= mmd->afd.afhi.chunks_total)
+ return -E_CHUNK;
+ afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
+ return 1;
}
/**
- * 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)
{
int i;
char *hn = para_hostname(), *home = para_homedir();
-
- PARA_DEBUG_LOG("supported audio formats: %s\n",
- SUPPORTED_AUDIO_FORMATS);
- for (i = 0; afl[i].name; i++) {
- PARA_NOTICE_LOG("initializing %s handler\n",
- afl[i].name);
- afl[i].init(&afl[i]);
- }
- ms2tv(conf.announce_time_arg, &announce_tv);
+ 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;
+ 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);
}
free(hn);
free(home);
+ mmd->sender_cmd_data.cmd_num = -1;
if (conf.autoplay_given) {
struct timeval now, tmp;
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);
-}
-
-/**
- * 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 -1;
-}
-
-static int get_audio_format(int omit)
-{
- int i;
-
- 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;
-}
-
-/*
- * 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)
return -1;
}
-static void vss_next_chunk_time(struct timeval *due)
-{
- struct timeval tmp;
-
- tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp);
- tv_add(&tmp, &mmd->stream_start, due);
-}
-
/*
* != NULL: timeout for next chunk
* NULL: nothing to do
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;
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 (!vss_playing() || !map)
return NULL;
- vss_next_chunk_time(&next_chunk);
- if (chk_barrier(afl[mmd->audio_format].name, &now, &next_chunk,
- &the_timeout, 0) < 0)
+ compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+ &mmd->stream_start, &next_chunk);
+ if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
return &the_timeout;
/* chunk is due or bof */
the_timeout.tv_sec = 0;
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) {
- 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);
- af->close_audio_file();
- audio_file = NULL;
- mmd->audio_format = -1;
- af = NULL;
+ tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
+ munmap(map, mmd->size);
+ map = 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);
- 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++;
}
/**
- * 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
- *
- * \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.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.
*
+ * \sa afh_get_header.
*/
-char *vss_get_header(int *header_len)
+void vss_get_header(char **buf, size_t *len)
{
- if (mmd->audio_format < 0)
- return NULL;
- *header_len = mmd->afi.header_len;
- return mmd->afi.header;
+ afh_get_header(&mmd->afd.afhi, map, buf, len);
}
/**
- * 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.
*/
}
/**
- * 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
+};
+
+static enum afs_socket_status afsss;
+
+static int need_to_request_new_audio_file(void)
+{
+ if (map) /* have audio file */
+ return 0;
+ if (!vss_playing()) /* don't need one */
+ return 0;
+ if (mmd->new_vss_status_flags & VSS_NOMORE)
+ return 0;
+ if (afsss == AFS_SOCKET_AFD_PENDING) /* already requested one */
+ return 0;
+ return 1;
}
/**
- * 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.
*
+ * \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
*
- * - 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
- for (i = 0; senders[i].name; i++)
- senders[i].shutdown_clients();
- if (vss_next() && af) {
- vss_eof(af);
- return vss_compute_timeout();
- }
- if (vss_paused() || vss_repos()) {
+ int i;
+ struct timeval now;
+
+ if (!map || vss_next() || vss_paused() || vss_repos())
for (i = 0; senders[i].name; i++)
senders[i].shutdown_clients();
- if (af) {
- struct timeval now;
+ if (vss_next())
+ vss_eof();
+ else if (vss_paused()) {
+ if (mmd->chunks_sent) {
gettimeofday(&now, NULL);
- if (!vss_paused() || mmd->chunks_sent)
- 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)
- mmd->new_vss_status_flags = VSS_NEXT;
+ tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
}
mmd->chunks_sent = 0;
- }
- if (vss_repos()) {
- mmd->new_vss_status_flags &= ~(VSS_REPOS);
+ } else if (vss_repos()) {
+ gettimeofday(&now, NULL);
+ tv_add(&now, &announce_tv, &data_send_barrier);
+ tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
+ mmd->chunks_sent = 0;
mmd->current_chunk = mmd->repos_request;
+ mmd->new_vss_status_flags &= ~VSS_REPOS;
}
- ret = vss_compute_timeout();
- if (!ret && !audio_file && 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 (need_to_request_new_audio_file()) {
+ 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;
+ } else
+ para_fd_set(afs_socket, rfds, max_fileno);
+ for (i = 0; senders[i].name; i++) {
+ if (!senders[i].pre_select)
+ continue;
+ senders[i].pre_select(max_fileno, rfds, wfds);
}
- return ret;
+ return vss_compute_timeout();
}
-/**
- * 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)
+static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
{
- 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;
+ char control[255], buf[8];
+ struct msghdr msg = {.msg_iov = NULL};
+ struct cmsghdr *cmsg;
+ struct iovec iov;
+ int ret = 0;
+
+ *fd = -1;
+ 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);
+ afsss = AFS_SOCKET_READY;
+ if (iov.iov_len != sizeof(buf))
+ return -E_AFS_SHORT_READ;
+ *code = *(uint32_t*)buf;
+ *data = *(uint32_t*)(buf + 4);
+ 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);
}
- ret = para_fseek(audio_file, pos, SEEK_SET);
+ return 1;
+}
+
+static void recv_afs_result(void)
+{
+ int ret, passed_fd, shmid;
+ uint32_t afs_code = 0, afs_data = 0;
+ struct stat statbuf;
+ struct timeval now;
+
+ mmd->afd.afhi.chunk_table = NULL;
+ ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
if (ret < 0)
- return ret;
- return para_fread(inbuf, len, 1, audio_file);
+ goto err;
+ 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;
+ if (passed_fd < 0)
+ goto err;
+ shmid = afs_data;
+ ret = load_afd(shmid, &mmd->afd);
+ if (ret < 0)
+ goto err;
+ shm_destroy(shmid);
+ ret = fstat(passed_fd, &statbuf);
+ if (ret < 0) {
+ PARA_ERROR_LOG("fstat error:\n");
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto err;
+ }
+ mmd->size = statbuf.st_size;
+ mmd->mtime = statbuf.st_mtime;
+ map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
+ passed_fd, 0);
+ close(passed_fd);
+ mmd->chunks_sent = 0;
+ mmd->current_chunk = 0;
+ mmd->offset = 0;
+ mmd->events++;
+ mmd->num_played++;
+ mmd->new_vss_status_flags &= (~VSS_NEXT);
+ gettimeofday(&now, NULL);
+ tv_add(&now, &announce_tv, &data_send_barrier);
+ return;
+err:
+ free(mmd->afd.afhi.chunk_table);
+ if (passed_fd >= 0)
+ close(passed_fd);
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ mmd->new_vss_status_flags = VSS_NEXT;
}
/**
- * 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.
+ * Main sending function.
*
- * Return value: Positive return value on success, zero on eof and negative
- * on errors.
+ * 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)
+static void vss_send_chunk(void)
{
int i;
- struct audio_format_handler *af;
- ssize_t ret;
struct timeval now, due;
+ char *buf;
+ size_t len;
- if (mmd->audio_format < 0 || !audio_file || !vss_playing())
+ if (!map || !vss_playing())
return;
- af = &afl[mmd->audio_format];
gettimeofday(&now, NULL);
- vss_next_chunk_time(&due);
+ compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+ &mmd->stream_start, &due);
if (tv_diff(&due, &now, NULL) > 0)
return;
if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
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);
+ if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
+ mmd->new_vss_status_flags |= VSS_NEXT;
return;
}
/*
* 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;
+ * 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, &mmd->afi.chunk_tv, &tmp);
+ tv_scale(mmd->current_chunk, &mmd->afd.afhi.chunk_tv, &tmp);
mmd->offset = tv2ms(&tmp);
mmd->events++;
}
+ afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len);
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, buf, len);
mmd->new_vss_status_flags |= VSS_PLAYING;
mmd->chunks_sent++;
mmd->current_chunk++;
}
+
+void vss_post_select(fd_set *rfds, fd_set *wfds)
+{
+ int ret, i;
+
+ if (mmd->sender_cmd_data.cmd_num >= 0) {
+ int num = mmd->sender_cmd_data.cmd_num,
+ s = mmd->sender_cmd_data.sender_num;
+
+ if (senders[s].client_cmds[num])
+ senders[s].client_cmds[num](&mmd->sender_cmd_data);
+ mmd->sender_cmd_data.cmd_num = -1;
+ }
+ if (afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
+ if (FD_ISSET(afs_socket, rfds))
+ recv_afs_result();
+ } else if (FD_ISSET(afs_socket, wfds)) {
+ PARA_NOTICE_LOG("requesting new fd from afs\n");
+ ret = send_buffer(afs_socket, "new");
+ afsss = AFS_SOCKET_AFD_PENDING;
+ }
+ for (i = 0; senders[i].name; i++) {
+ if (!senders[i].post_select)
+ continue;
+ senders[i].post_select(rfds, wfds);
+ }
+ vss_send_chunk();
+}
projects / paraslash.git / blobdiff