X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=1005139d8365165903ac01b8dac011017346c5c9;hp=f57ca89fb4b4afc8d7387269d97c0dd1630fddd5;hb=44aa9a29ecc951d74a28bd79462cb0f9b628523e;hpb=9d9ef4f91346188baaef1656b861151ea23437d9 diff --git a/afh_common.c b/afh_common.c index f57ca89f..1005139d 100644 --- a/afh_common.c +++ b/afh_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,6 +10,7 @@ #include /* gettimeofday */ #include #include +#include #include "para.h" #include "error.h" @@ -26,6 +27,7 @@ void mp3_init(struct audio_format_handler *); void aac_afh_init(struct audio_format_handler *); #endif +void wma_afh_init(struct audio_format_handler *); /** * The list of supported audio formats. * @@ -55,6 +57,10 @@ static struct audio_format_handler afl[] = { .init = aac_afh_init, #endif }, + { + .name = "wma", + .init = wma_afh_init, + }, { .name = NULL, } @@ -91,15 +97,14 @@ void afh_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. + * \return This function returns \p -E_AUDIO_FORMAT 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) { @@ -119,7 +124,7 @@ int guess_audio_format(const char *name) return i; } } - return -1; + return -E_AUDIO_FORMAT; } /** @@ -128,6 +133,7 @@ int guess_audio_format(const char *name) * \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 fd The open file descriptor. * \param afhi Result pointer. * * \return The number of the audio format on success, \p -E_AUDIO_FORMAT if no @@ -140,29 +146,59 @@ int guess_audio_format(const char *name) * 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, +int compute_afhi(const char *path, char *data, size_t size, int fd, struct afh_info *afhi) { int ret, i, format; afhi->header_offset = 0; 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, afhi); - if (ret >= 0) - return format; + ret = afl[format].get_file_info(data, size, fd, afhi); + if (ret >= 0) { + ret = format; + 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, afhi); - if (ret >= 0) - return i; + ret = afl[i].get_file_info(data, size, fd, afhi); + if (ret >= 0) { + ret = i; + goto success; + } PARA_WARNING_LOG("%s\n", para_strerror(-ret)); } return -E_AUDIO_FORMAT; +success: + if (!afhi->techinfo) + afhi->techinfo = para_strdup(NULL); + if (!afhi->tags.artist) + afhi->tags.artist = para_strdup(NULL); + if (!afhi->tags.title) + afhi->tags.title = para_strdup(NULL); + if (!afhi->tags.year) + afhi->tags.year = para_strdup(NULL); + if (!afhi->tags.album) + afhi->tags.album = para_strdup(NULL); + if (!afhi->tags.comment) + afhi->tags.comment = para_strdup(NULL); + PARA_DEBUG_LOG("techinfo: %s\n", afhi->techinfo); + PARA_DEBUG_LOG("artist: %s\n", afhi->tags.artist); + PARA_DEBUG_LOG("title: %s\n", afhi->tags.title); + PARA_DEBUG_LOG("year: %s\n", afhi->tags.year); + PARA_DEBUG_LOG("album: %s\n", afhi->tags.album); + PARA_DEBUG_LOG("comment: %s\n", afhi->tags.comment); + return ret; } /** @@ -175,12 +211,23 @@ int compute_afhi(const char *path, char *data, size_t size, */ 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)"; + if (i < 0 || i >= ARRAY_SIZE(afl) - 1) + return "???"; + return afl[i].name; } - +/** + * Get one chunk of audio data. + * + * \param chunk_num The number of the chunk to get. + * \param afhi Describes the audio file. + * \param map The memory mapped audio file. + * \param buf Result pointer. + * \param len The length of the chunk in bytes. + * + * Upon return, \a buf will point so memory inside \a map. The returned buffer + * must therefore not be freed by the caller. + */ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, void *map, const char **buf, size_t *len) { @@ -189,6 +236,15 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, *len = afhi->chunk_table[chunk_num + 1] - pos; } +uint32_t afh_get_largest_chunk_size(struct afh_info *afhi) +{ + uint32_t n, largest = 0, *ct = afhi->chunk_table; + + for (n = 1; n <= afhi->chunks_total; n++) + largest = PARA_MAX(largest, ct[n] - ct[n - 1]); + return largest; +} + /** * Get the header of an audio file. * @@ -199,13 +255,14 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi, * * This function sets \a buf to \p NULL and \a len to zero if \a map or \a * afhi is \p NULL, or if the current audio format does not need special - * header treamtment. + * header treatment. */ void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len) { - if (!map || !afhi || ! afhi->header_len) { + if (!map || !afhi || !afhi->header_len) { *buf = NULL; *len = 0; + return; } *len = afhi->header_len; *buf = map + afhi->header_offset;