X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=bab4d41577952f257ef8c828f9c89c8886a7d2e5;hp=063ae8f0b104ccab15e9f10f637ec34e7783e785;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=73073e4f4209c874f2f41e270376a9802862df8f diff --git a/afh_common.c b/afh_common.c index 063ae8f0..bab4d415 100644 --- a/afh_common.c +++ b/afh_common.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 1997 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 1997 Andre Noll , see file COPYING. */ /** \file afh_common.c Common audio format handler functions. */ @@ -16,19 +12,29 @@ #include "afh.h" typedef void afh_init_func(struct audio_format_handler *); -/* It does not hurt to declare init functions which are not available. */ -extern afh_init_func mp3_init, ogg_init, aac_afh_init, wma_afh_init, + +/* + * Declaration of the audio format handler init functions. + * + * These symbols are referenced in the afl array below. + * + * Most audio format handlers depend on an external library and are not + * compiled in if the library is not installed. Hence it is well possible that + * not all of these functions are defined. It does not hurt to declare them + * anyway, and this avoids another set of ifdefs. + */ +extern afh_init_func mp3_afh_init, ogg_afh_init, aac_afh_init, wma_afh_init, spx_afh_init, flac_afh_init, opus_afh_init; /** The list of all status items */ -const char *status_item_list[] = {STATUS_ITEM_ARRAY}; +const char *status_item_list[] = {STATUS_ITEMS}; /** * 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 database. We don't want that numbers to become + * audio format is stored in the database. We don't want these numbers to become * stale just because the user installed a new version of paraslash that * supports a different set of audio formats. * @@ -38,17 +44,17 @@ const char *status_item_list[] = {STATUS_ITEM_ARRAY}; static struct audio_format_handler afl[] = { { .name = "mp3", - .init = mp3_init, + .init = mp3_afh_init, }, { .name = "ogg", #if defined(HAVE_OGG) && defined(HAVE_VORBIS) - .init = ogg_init, + .init = ogg_afh_init, #endif }, { .name = "aac", -#if defined(HAVE_MP4V2) +#if defined(HAVE_FAAD) .init = aac_afh_init, #endif }, @@ -88,7 +94,6 @@ static inline int next_audio_format(int format) if (afl[format].init) return format; } - } /** Iterate over each supported audio format. */ @@ -109,6 +114,22 @@ void afh_init(void) } } +/** + * Tell whether an audio format handler provides chunk tables. + * + * Each audio format handler either provides a chunk table or supports dynamic + * chunks. + * + * \param audio_format_id Offset in the afl array. + * + * \return True if dynamic chunks are supported, false if the audio format + * handler provides chunk tables. + */ +bool afh_supports_dynamic_chunks(int audio_format_id) +{ + return afl[audio_format_id].get_chunk; +} + /** * Guess the audio format judging from filename. * @@ -139,6 +160,38 @@ int guess_audio_format(const char *name) return -E_AUDIO_FORMAT; } +/** + * Get the name of the given audio format. + * + * \param i The audio format number. + * + * \return This returns a pointer to statically allocated memory so it + * must not be freed by the caller. + */ +const char *audio_format_name(int i) +{ + if (i < 0 || i >= ARRAY_SIZE(afl) - 1) + return "???"; + return afl[i].name; +} + +static int get_file_info(int format, const char *path, char *data, + size_t size, int fd, struct afh_info *afhi) +{ + int ret; + const char *fmt = audio_format_name(format); + + memset(afhi, 0, sizeof(*afhi)); + ret = afl[format].get_file_info(data, size, fd, afhi); + if (ret < 0) { + PARA_WARNING_LOG("%s: %s format not detected: %s\n", + path, fmt, para_strerror(-ret)); + return ret; + } + PARA_NOTICE_LOG("%s: detected %s format\n", path, fmt); + return format; +} + /** * Call get_file_info() to obtain an afhi structure. * @@ -163,31 +216,18 @@ int compute_afhi(const char *path, char *data, size_t size, int fd, { int ret, i, format; - afhi->header_len = 0; - afhi->techinfo = NULL; - afhi->tags.artist = NULL; - afhi->tags.title = NULL; - afhi->tags.year = NULL; - afhi->tags.album = NULL; - afhi->tags.comment = NULL; format = guess_audio_format(path); - if (format >= 0) { - ret = afl[format].get_file_info(data, size, fd, afhi); - if (ret >= 0) { - ret = format; + ret = get_file_info(format, path, data, size, fd, afhi); + if (ret >= 0) goto success; - } } 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, fd, afhi); - if (ret >= 0) { - ret = i; + ret = get_file_info(i, path, data, size, fd, afhi); + if (ret >= 0) goto success; - } - PARA_WARNING_LOG("%s\n", para_strerror(-ret)); } return -E_AUDIO_FORMAT; success: @@ -233,21 +273,6 @@ void clear_afhi(struct afh_info *afhi) free(afhi->tags.comment); } -/** - * Get the name of the given audio format. - * - * \param i The audio format number. - * - * \return This returns a pointer to statically allocated memory so it - * must not be freed by the caller. - */ -const char *audio_format_name(int i) -{ - if (i < 0 || i >= ARRAY_SIZE(afl) - 1) - return "???"; - return afl[i].name; -} - static inline size_t get_chunk_len(long unsigned chunk_num, const struct afh_info *afhi) { @@ -257,21 +282,73 @@ static inline size_t get_chunk_len(long unsigned chunk_num, /** * Get one chunk of audio data. * + * This implicitly calls the ->open method of the audio format handler at the + * first call. + * * \param chunk_num The number of the chunk to get. * \param afhi Describes the audio file. + * \param audio_format_id Determines the afh. * \param map The memory mapped audio file. + * \param mapsize Passed to the afh's ->open() method. * \param buf Result pointer. * \param len The length of the chunk in bytes. + * \param afh_context Value/result, determines whether ->open() is called. * * Upon return, \a buf will point so memory inside \a map. The returned buffer * must therefore not be freed by the caller. + * + * \return Standard. + */ +__must_check int afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, + uint8_t audio_format_id, const void *map, size_t mapsize, + const char **buf, size_t *len, void **afh_context) +{ + struct audio_format_handler *afh = afl + audio_format_id; + + if (afh_supports_dynamic_chunks(audio_format_id)) { + int ret; + + if (!*afh_context) { + ret = afh->open(map, mapsize, afh_context); + if (ret < 0) + return ret; + } + ret = afl[audio_format_id].get_chunk(chunk_num, *afh_context, + buf, len); + if (ret < 0) { + afh->close(*afh_context); + *afh_context = NULL; + } + return ret; + } else { + size_t pos = afhi->chunk_table[chunk_num]; + *buf = map + pos; + *len = get_chunk_len(chunk_num, afhi); + return 0; + } +} + +/** + * Deallocate resources allocated due to dynamic chunk handling. + * + * This function should be called if afh_get_chunk() was called at least once. + * It is OK to call it even for audio formats which do not support dynamic + * chunks, in which case the function does nothing. + * + * \param afh_context As returned from the ->open method of the afh. + * \param audio_format_id Determines the afh. */ -void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, - void *map, const char **buf, size_t *len) +void afh_close(void *afh_context, uint8_t audio_format_id) { - size_t pos = afhi->chunk_table[chunk_num]; - *buf = map + pos; - *len = get_chunk_len(chunk_num, afhi); + struct audio_format_handler *afh = afl + audio_format_id; + + if (!afh_supports_dynamic_chunks(audio_format_id)) + return; + if (!afh->close) + return; + if (!afh_context) + return; + afh->close(afh_context); } /** @@ -279,20 +356,26 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, * * \param approx_chunk_num Upper bound for the chunk number to return. * \param afhi Needed for the chunk table. + * \param audio_format_id Determines the afh. * - * \return The first non-empty chunk <= \a approx_chunk_num. + * \return For audio format handlers which support dynamic chunks, the function + * returns the given chunk number. Otherwise it returns the first non-empty + * chunk <= \a approx_chunk_num. * * \sa \ref afh_get_chunk(). */ int32_t afh_get_start_chunk(int32_t approx_chunk_num, - const struct afh_info *afhi) + const struct afh_info *afhi, uint8_t audio_format_id) { int32_t k; + if (afh_supports_dynamic_chunks(audio_format_id)) + return approx_chunk_num; + for (k = PARA_MAX(0, approx_chunk_num); k >= 0; k--) if (get_chunk_len(k, afhi) > 0) - break; - return k; + return k; + return 0; } /** @@ -370,29 +453,62 @@ unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **re "%s: %" PRIu32 "\n" /* seconds total */ "%s: %lu: %lu\n" /* chunk time */ "%s: %" PRIu32 "\n" /* num chunks */ + "%s: %" PRIu32 "\n" /* max chunk size */ "%s: %s\n" /* techinfo */ "%s: %s\n" /* artist */ "%s: %s\n" /* title */ "%s: %s\n" /* year */ "%s: %s\n" /* album */ "%s: %s\n", /* comment */ - status_item_list[SI_BITRATE], afhi->bitrate, - status_item_list[SI_FORMAT], audio_format_name(audio_format_num), - status_item_list[SI_FREQUENCY], afhi->frequency, - status_item_list[SI_CHANNELS], afhi->channels, - status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total, - status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec, + status_item_list[SI_bitrate], afhi->bitrate, + status_item_list[SI_format], audio_format_name(audio_format_num), + status_item_list[SI_frequency], afhi->frequency, + status_item_list[SI_channels], afhi->channels, + status_item_list[SI_seconds_total], afhi->seconds_total, + status_item_list[SI_chunk_time], (long unsigned)afhi->chunk_tv.tv_sec, (long unsigned)afhi->chunk_tv.tv_usec, - status_item_list[SI_NUM_CHUNKS], afhi->chunks_total, - status_item_list[SI_TECHINFO], afhi->techinfo? afhi->techinfo : "", - status_item_list[SI_ARTIST], afhi->tags.artist? afhi->tags.artist : "", - status_item_list[SI_TITLE], afhi->tags.title? afhi->tags.title : "", - status_item_list[SI_YEAR], afhi->tags.year? afhi->tags.year : "", - status_item_list[SI_ALBUM], afhi->tags.album? afhi->tags.album : "", - status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : "" + status_item_list[SI_num_chunks], afhi->chunks_total, + status_item_list[SI_max_chunk_size], afhi->max_chunk_size, + status_item_list[SI_techinfo], afhi->techinfo? afhi->techinfo : "", + status_item_list[SI_artist], afhi->tags.artist? afhi->tags.artist : "", + status_item_list[SI_title], afhi->tags.title? afhi->tags.title : "", + status_item_list[SI_year], afhi->tags.year? afhi->tags.year : "", + status_item_list[SI_album], afhi->tags.album? afhi->tags.album : "", + status_item_list[SI_comment], afhi->tags.comment? afhi->tags.comment : "" ); } +/** + * Determine the maximal chunk size by investigating the chunk table. + * + * \param afhi Value/result. + * + * This function iterates over the chunk table and sets ->max_chunk_size + * accordingly. The function exists only for backward compatibility since as of + * version 0.6.0, para_server stores the maximal chunk size in its database. + * This function is only called if the database value is zero, indicating that + * the file was added by an older server version. + */ +void set_max_chunk_size(struct afh_info *afhi) +{ + uint32_t n, max = 0, old = 0; + + for (n = 0; n <= afhi->chunks_total; n++) { + uint32_t val = afhi->chunk_table[n]; + /* + * If the first chunk is the header, do not consider it for the + * calculation of the largest chunk size. + */ + if (n == 0 || (n == 1 && afhi->header_len > 0)) { + old = val; + continue; + } + max = PARA_MAX(max, val - old); + old = val; + } + afhi->max_chunk_size = max; +} + /** * Create a copy of the given file with altered meta tags. *