#include "server.h"
#include "net.h"
#include "server.cmdline.h"
-#include "afs_common.h"
#include "vss.h"
#include "send.h"
#include "ipc.h"
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
*
&& !(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)";
-}
-
-static void afh_init(void)
-{
- int i;
-
- 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]);
- }
-}
-
/**
* initialize the virtual streaming system
*
conf.announce_time_arg : 300,
autoplay_delay = conf.autoplay_delay_arg > 0?
conf.autoplay_delay_arg : 0;
- afh_init();
ms2tv(announce_time, &announce_tv);
PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
for (i = 0; senders[i].name; i++) {
}
}
-/**
- * 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)
{
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);
}
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() || !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(audio_format_name(mmd->afd.afsi.audio_format_id),
+ &now, &next_chunk, &the_timeout, 0) < 0)
return &the_timeout;
/* chunk is due or bof */
the_timeout.tv_sec = 0;
int i;
char *tmp;
- PARA_NOTICE_LOG("EOF\n");
if (!map) {
for (i = 0; senders[i].name; i++)
senders[i].shutdown_clients();
return;
}
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;
+ 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_INFO1],
status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
- strcpy(mmd->afi.info_string, tmp);
+ strcpy(mmd->afd.afhi.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->afd.path[0] = '\0';
+ mmd->afd.afsi.lyrics_id = 0;
+ mmd->afd.afsi.image_id = 0;
+ mmd->mtime = 0;
+ mmd->afd.attributes_string[0] = '\0';
mmd->size = 0;
mmd->events++;
}
*/
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;
}
/**
*/
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;
}
enum afs_socket_status {
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)
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",
+ PARA_DEBUG_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)
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;
}
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->afd.afhi.header_len = 0; /* default: no header */
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);
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;
}
/**
*/
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;
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);
&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();
}
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++;
}
projects / paraslash.git / blobdiff