* 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 "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[];
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 *);
#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))
/**
}
/**
- * 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)";
}
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]);
return i;
}
}
- return -1;
+ return -E_BAD_AUDIO_FILE_SUFFIX;
}
static int get_audio_format(int omit)
return -E_AUDIO_FORMAT;
}
+/**
+ * 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;
+}
+
/*
* upddate shared mem
*/
}
/**
- * 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
*
* treamtment.
*
*/
-char *vss_get_header(unsigned *header_len)
+char *vss_get_header(size_t *header_len)
{
if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
return NULL;
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
*
* \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:
+
+ para_fd_set(afs_socket, rfds, max_fileno);
+
+//again:
format = mmd->audio_format;
if (format >= 0)
af = afl + format;
if (!ret && !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();
- goto again;
+ //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;
}
+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;
+
+ 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;
+ }
+ 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;
+ 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];
projects / paraslash.git / blobdiff