X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=7f2a22a223ce733aa4b49d0a60ff63d1b95bf321;hp=8550a8ac6801d421e5cf186b48360922face11e8;hb=refs%2Fheads%2Fnext;hpb=b59e841036a107b52a0221e48d7e05f86da92979 diff --git a/aac_afh.c b/aac_afh.c index 8550a8ac..c4301a2f 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,8 +1,4 @@ -/* - * Copyright (C) 2006 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2006 Andre Noll , see file COPYING. */ /* * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker, * Ahead Software AG @@ -14,11 +10,7 @@ #include #include "para.h" - -/* To get the mp4ff_tag_t and mp4ff_metadata_t typedefs. */ -#define USE_TAGGING -#include - +#include "mp4.h" #include "error.h" #include "portable_io.h" #include "afh.h" @@ -30,63 +22,44 @@ struct aac_afh_context { const void *map; size_t mapsize; size_t fpos; - int32_t track; - mp4ff_t *mp4ff; - mp4AudioSpecificConfig masc; - mp4ff_callback_t cb; + struct mp4 *mp4; + struct mp4_callback cb; }; -static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want) +static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want) { struct aac_afh_context *c = user_data; - uint32_t have, rv; + size_t have, rv; - if (want == 0 || c->fpos >= c->mapsize) { - PARA_INFO_LOG("failed attempt to read %u bytes @%zu\n", want, - c->fpos); - errno = EAGAIN; - return -1; - } + if (want == 0 || c->fpos >= c->mapsize) + return 0; have = c->mapsize - c->fpos; rv = PARA_MIN(have, want); - PARA_DEBUG_LOG("reading %u bytes @%zu\n", rv, c->fpos); + PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos); memcpy(dest, c->map + c->fpos, rv); c->fpos += rv; return rv; } -static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos) +static off_t aac_afh_seek_cb(void *user_data, off_t offset, int whence) { struct aac_afh_context *c = user_data; - c->fpos = pos; - return 0; -} -static int32_t aac_afh_get_track(mp4ff_t *mp4ff, mp4AudioSpecificConfig *masc) -{ - int32_t i, rc, num_tracks = mp4ff_total_tracks(mp4ff); - - assert(num_tracks >= 0); - for (i = 0; i < num_tracks; i++) { - unsigned char *buf = NULL; - unsigned buf_size = 0; - - mp4ff_get_decoder_config(mp4ff, i, &buf, &buf_size); - if (buf) { - rc = NeAACDecAudioSpecificConfig(buf, buf_size, masc); - free(buf); - if (rc < 0) - continue; - return i; - } - } - return -1; /* no audio track */ + if (whence == SEEK_SET) + c->fpos = offset; + else if (whence == SEEK_CUR) + c->fpos += offset; + else if (whence == SEEK_END) + c->fpos = c->mapsize + offset; + else + assert(false); + return c->fpos; } static int aac_afh_open(const void *map, size_t mapsize, void **afh_context) { int ret; - struct aac_afh_context *c = para_malloc(sizeof(*c)); + struct aac_afh_context *c = alloc(sizeof(*c)); c->map = map; c->mapsize = mapsize; @@ -95,18 +68,11 @@ static int aac_afh_open(const void *map, size_t mapsize, void **afh_context) c->cb.seek = aac_afh_seek_cb; c->cb.user_data = c; - ret = -E_MP4FF_OPEN; - c->mp4ff = mp4ff_open_read(&c->cb); - if (!c->mp4ff) + ret = mp4_open(&c->cb, &c->mp4); + if (ret < 0) goto free_ctx; - c->track = aac_afh_get_track(c->mp4ff, &c->masc); - ret = -E_MP4FF_TRACK; - if (c->track < 0) - goto close_mp4ff; *afh_context = c; return 0; -close_mp4ff: - mp4ff_close(c->mp4ff); free_ctx: free(c); *afh_context = NULL; @@ -116,51 +82,39 @@ free_ctx: static void aac_afh_close(void *afh_context) { struct aac_afh_context *c = afh_context; - mp4ff_close(c->mp4ff); + mp4_close(c->mp4); free(c); } -/** - * Libmp4ff function to reposition the file to the given sample. - * - * \param f The opaque handle returned by mp4ff_open_read(). - * \param track The number of the (audio) track. - * \param sample Destination. - * - * We need this function to obtain the offset of the sample within the audio - * file. Unfortunately, it is not exposed in the mp4ff header. - * - * \return This function always returns 0. - */ -int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample); - -static int aac_afh_get_chunk(long unsigned chunk_num, void *afh_context, - const char **buf, size_t *len) +static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context, + const char **buf, uint32_t *len) { struct aac_afh_context *c = afh_context; - int32_t ss; + uint32_t ss; size_t offset; + int ret; - assert(chunk_num <= INT_MAX); - /* this function always returns zero */ - mp4ff_set_sample_position(c->mp4ff, c->track, chunk_num); + ret = mp4_set_sample_position(c->mp4, chunk_num); + if (ret < 0) + return ret; offset = c->fpos; - ss = mp4ff_read_sample_getsize(c->mp4ff, c->track, chunk_num); - if (ss <= 0) - return -E_MP4FF_BAD_SAMPLE; - assert(ss + offset <= c->mapsize); + ret = mp4_get_sample_size(c->mp4, chunk_num, &ss); + if (ret < 0) + return ret; + if (ss + offset > c->mapsize) /* file got truncated?! */ + return -E_MP4_CORRUPT; *buf = c->map + offset; *len = ss; return 1; } -static void _aac_afh_get_taginfo(const mp4ff_t *mp4ff, struct taginfo *tags) +static void aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags) { - mp4ff_meta_get_artist(mp4ff, &tags->artist); - mp4ff_meta_get_title(mp4ff, &tags->title); - mp4ff_meta_get_date(mp4ff, &tags->year); - mp4ff_meta_get_album(mp4ff, &tags->album); - mp4ff_meta_get_comment(mp4ff, &tags->comment); + tags->artist = mp4_get_tag_value(mp4, "artist"); + tags->title = mp4_get_tag_value(mp4, "title"); + tags->year = mp4_get_tag_value(mp4, "date"); + tags->album = mp4_get_tag_value(mp4, "album"); + tags->comment = mp4_get_tag_value(mp4, "comment"); } /* @@ -170,184 +124,140 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd, struct afh_info *afhi) { int ret; - int32_t rv; struct aac_afh_context *c; - int64_t tmp; + uint64_t milliseconds; const char *buf; - size_t sz; - uint32_t n; + uint32_t n, len; ret = aac_afh_open(map, numbytes, (void **)&c); if (ret < 0) return ret; - ret = -E_MP4FF_BAD_SAMPLERATE; - rv = mp4ff_get_sample_rate(c->mp4ff, c->track); - if (rv <= 0) - goto close; - afhi->frequency = rv; - - ret = -E_MP4FF_BAD_CHANNEL_COUNT; - rv = mp4ff_get_channel_count(c->mp4ff, c->track); - if (rv <= 0) - goto close; - afhi->channels = rv; - - ret = -E_MP4FF_BAD_SAMPLE_COUNT; - rv = mp4ff_num_samples(c->mp4ff, c->track); - if (rv <= 0) - goto close; - afhi->chunks_total = rv; + afhi->frequency = mp4_get_sample_rate(c->mp4); + assert(afhi->frequency > 0); + afhi->channels = mp4_get_channel_count(c->mp4); + assert(afhi->channels > 0); + afhi->chunks_total = mp4_num_samples(c->mp4); + assert(afhi->chunks_total > 0); + afhi->max_chunk_size = 0; for (n = 0; n < afhi->chunks_total; n++) { - if (aac_afh_get_chunk(n, c, &buf, &sz) < 0) - break; - afhi->max_chunk_size = PARA_MAX((size_t)afhi->max_chunk_size, sz); + ret = aac_afh_get_chunk(n, c, &buf, &len); + if (ret < 0) + goto out; + afhi->max_chunk_size = PARA_MAX(afhi->max_chunk_size, len); } - - tmp = c->masc.sbr_present_flag == 1? 2048 : 1024; - afhi->seconds_total = tmp * afhi->chunks_total / afhi->frequency; - ms2tv(1000 * tmp / afhi->frequency, &afhi->chunk_tv); - - if (aac_afh_get_chunk(0, c, &buf, &sz) >= 0) - numbytes -= buf - map; + milliseconds = mp4_get_duration(c->mp4); + afhi->seconds_total = milliseconds / 1000; + ms2tv(milliseconds / afhi->chunks_total, &afhi->chunk_tv); + if (aac_afh_get_chunk(0, c, &buf, &len) < 0) + goto out; + numbytes -= buf - map; afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000; - _aac_afh_get_taginfo(c->mp4ff, &afhi->tags); + aac_afh_get_taginfo(c->mp4, &afhi->tags); ret = 1; -close: +out: aac_afh_close(c); return ret; } -static uint32_t aac_afh_meta_read_cb(void *user_data, void *dest, uint32_t want) +static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want) { int fd = *(int *)user_data; return read(fd, dest, want); } -static uint32_t aac_afh_meta_seek_cb(void *user_data, uint64_t pos) +static off_t aac_afh_meta_seek_cb(void *user_data, off_t offset, int whence) { int fd = *(int *)user_data; - return lseek(fd, pos, SEEK_SET); + off_t ret = lseek(fd, offset, whence); + + assert(ret != (off_t)-1); + return ret; } -static uint32_t aac_afh_meta_write_cb(void *user_data, void *dest, uint32_t want) +static ssize_t aac_afh_meta_write_cb(void *user_data, void *dest, size_t count) { int fd = *(int *)user_data; - return write(fd, dest, want); + return write(fd, dest, count); } -static uint32_t aac_afh_meta_truncate_cb(void *user_data) +static int aac_afh_meta_truncate_cb(void *user_data) { int fd = *(int *)user_data; off_t offset = lseek(fd, 0, SEEK_CUR); return ftruncate(fd, offset); } -static void replace_tag(mp4ff_tag_t *tag, const char *new_val, bool *found) +static void replace_or_add_tag(const char *item, const char *value, + struct mp4_metadata *meta) { - free(tag->value); - tag->value = para_strdup(new_val); - *found = true; -} - -static void add_tag(mp4ff_metadata_t *md, const char *item, const char *value) -{ - md->tags[md->count].item = para_strdup(item); - md->tags[md->count].value = para_strdup(value); - md->count++; + uint32_t n; + struct mp4_tag *t; + + for (n = 0; n < meta->count; n++) { + t = meta->tags + n; + if (strcasecmp(t->item, item)) + continue; + free(t->value); + t->value = para_strdup(value); + return; + } + /* item not found, add new tag */ + meta->tags = para_realloc(meta->tags, (meta->count + 1) + * sizeof(struct mp4_tag)); + t = meta->tags + meta->count; + t->item = para_strdup(item); + t->value = para_strdup(value); + meta->count++; } static int aac_afh_rewrite_tags(const char *map, size_t mapsize, struct taginfo *tags, int fd, __a_unused const char *filename) { - int ret, i; - int32_t rv; - mp4ff_metadata_t metadata; - mp4ff_t *mp4ff; - mp4ff_callback_t cb = { + int ret; + struct mp4_metadata *metadata; + struct mp4 *mp4; + struct mp4_callback cb = { .read = aac_afh_meta_read_cb, .seek = aac_afh_meta_seek_cb, .write = aac_afh_meta_write_cb, .truncate = aac_afh_meta_truncate_cb, .user_data = &fd }; - bool found_artist = false, found_title = false, found_album = false, - found_year = false, found_comment = false; ret = write_all(fd, map, mapsize); if (ret < 0) return ret; lseek(fd, 0, SEEK_SET); - mp4ff = mp4ff_open_read_metaonly(&cb); - if (!mp4ff) - return -E_MP4FF_OPEN; - - ret = -E_MP4FF_META_READ; - rv = mp4ff_meta_get_num_items(mp4ff); - if (rv < 0) - goto close; - metadata.count = rv; - PARA_NOTICE_LOG("%d metadata item(s) found\n", rv); - - metadata.tags = para_malloc((metadata.count + 5) * sizeof(mp4ff_tag_t)); - for (i = 0; i < metadata.count; i++) { - mp4ff_tag_t *tag = metadata.tags + i; - - ret = -E_MP4FF_META_READ; - if (mp4ff_meta_get_by_index(mp4ff, i, - &tag->item, &tag->value) < 0) - goto free_tags; - PARA_INFO_LOG("found: %s: %s\n", tag->item, tag->value); - if (!strcmp(tag->item, "artist")) - replace_tag(tag, tags->artist, &found_artist); - else if (!strcmp(tag->item, "title")) - replace_tag(tag, tags->title, &found_title); - else if (!strcmp(tag->item, "album")) - replace_tag(tag, tags->album, &found_album); - else if (!strcmp(tag->item, "date")) - replace_tag(tag, tags->year, &found_year); - else if (!strcmp(tag->item, "comment")) - replace_tag(tag, tags->comment, &found_comment); - } - if (!found_artist) - add_tag(&metadata, "artist", tags->artist); - if (!found_title) - add_tag(&metadata, "title", tags->title); - if (!found_album) - add_tag(&metadata, "album", tags->album); - if (!found_year) - add_tag(&metadata, "date", tags->year); - if (!found_comment) - add_tag(&metadata, "comment", tags->comment); - ret = -E_MP4FF_META_WRITE; - if (mp4ff_meta_update(&cb, &metadata) < 0) - goto free_tags; - ret = 1; -free_tags: - for (; i > 0; i--) { - free(metadata.tags[i - 1].item); - free(metadata.tags[i - 1].value); - } - free(metadata.tags); -close: - mp4ff_close(mp4ff); + ret = mp4_open_meta(&cb, &mp4); + if (ret < 0) + return ret; + metadata = mp4_get_meta(mp4); + PARA_NOTICE_LOG("%u metadata item(s) found\n", metadata->count); + replace_or_add_tag("artist", tags->artist, metadata); + replace_or_add_tag("title", tags->title, metadata); + replace_or_add_tag("album", tags->album, metadata); + replace_or_add_tag("date", tags->year, metadata); + replace_or_add_tag("comment", tags->comment, metadata); + ret = mp4_update_meta(mp4); + mp4_close(mp4); return ret; } static const char * const aac_suffixes[] = {"m4a", "mp4", NULL}; + /** - * the init function of the aac audio format handler + * The audio format handler for the Advanced Audio Codec. * - * \param afh pointer to the struct to initialize + * This is only compiled in if the faad library is installed. */ -void aac_afh_init(struct audio_format_handler *afh) -{ - afh->get_file_info = aac_get_file_info, - afh->suffixes = aac_suffixes; - afh->rewrite_tags = aac_afh_rewrite_tags; - afh->open = aac_afh_open; - afh->get_chunk = aac_afh_get_chunk; - afh->close = aac_afh_close; -} +const struct audio_format_handler aac_afh = { + .get_file_info = aac_get_file_info, + .suffixes = aac_suffixes, + .rewrite_tags = aac_afh_rewrite_tags, + .open = aac_afh_open, + .get_chunk = aac_afh_get_chunk, + .close = aac_afh_close, +};