From 94e85c0e9e9493004b9b1ce3f3b1c78fd2d682be Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 23 Oct 2007 00:50:47 +0200 Subject: [PATCH 1/1] Move common audio format handler functions to new afh_common.c. --- afh.h | 5 ++ configure.ac | 4 +- error.h | 1 + vss.c | 157 --------------------------------------------------- vss.h | 4 -- 5 files changed, 8 insertions(+), 163 deletions(-) diff --git a/afh.h b/afh.h index 7c6912c3..9ad07858 100644 --- a/afh.h +++ b/afh.h @@ -101,3 +101,8 @@ struct audio_format_handler { struct audio_format_info *afi); }; +void afh_init(void); +int guess_audio_format(const char *name); +int compute_afhi(const char *path, char *data, size_t size, + struct audio_format_info *afhi); +const char *audio_format_name(int); diff --git a/configure.ac b/configure.ac index 0ad2106b..4d984457 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ strncasecmp strrchr strspn alarm], [], [AC_MSG_ERROR([function not found, cannot live without it])]) -all_errlist_objs="server mp3_afh vss command net string signal random_selector time +all_errlist_objs="server mp3_afh afh_common vss command net string signal random_selector time daemon stat crypt http_send afs_common close_on_fork playlist_selector ipc dccp dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer playlist sha1 rbtree sched audiod grab_client filter_chain wav compress @@ -110,7 +110,7 @@ audiod_audio_formats="" server_cmdline_objs="server.cmdline server_command_list random_selector_command_list playlist_selector_command_list afs_command_list" -server_errlist_objs="server mp3_afh vss command net string signal random_selector +server_errlist_objs="server afh_common mp3_afh vss command net string signal random_selector time daemon stat crypt http_send afs_common close_on_fork playlist_selector ipc dccp dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob playlist sha1 rbtree sched" diff --git a/error.h b/error.h index b6670df8..9d1f7bb0 100644 --- a/error.h +++ b/error.h @@ -25,6 +25,7 @@ DEFINE_ERRLIST_OBJECT_ENUM; #define SCORE_ERRORS #define SHA1_ERRORS #define RECV_ERRORS +#define AFH_COMMON_ERRORS extern const char **para_errlist[]; diff --git a/vss.c b/vss.c index 94134b51..3d54f16c 100644 --- a/vss.c +++ b/vss.c @@ -44,66 +44,6 @@ 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,34 +89,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)"; -} - -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 * @@ -210,75 +122,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) diff --git a/vss.h b/vss.h index 0ef9892c..c521e0dd 100644 --- a/vss.h +++ b/vss.h @@ -9,16 +9,12 @@ void vss_init(void); void vss_send_chunk(void); struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno); void vss_post_select(fd_set *rfds, fd_set *wfds); -const char *audio_format_name(int); unsigned int vss_playing(void); unsigned int vss_next(void); unsigned int vss_repos(void); unsigned int vss_paused(void); char *vss_get_header(size_t *header_len); struct timeval *vss_chunk_time(void); -int guess_audio_format(const char *name); -int compute_afhi(const char *path, char *data, size_t size, - struct audio_format_info *afhi); const char *supported_audio_formats(void); int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len); -- 2.39.2