X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=d12dfa19ca8eb59f7a47951665941d63fd8ba1a6;hb=b8c3826d17840af9d994074fb4190d0ce66cbc05;hp=80b50a4d55b6645aba8331c562b3667dc42663f7;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07;p=paraslash.git diff --git a/aac_afh.c b/aac_afh.c index 80b50a4d..5018e2f4 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,15 +8,17 @@ * Ahead Software AG */ -/** \file aac_afh.c para_server's aac audio format handler */ +/** \file aac_afh.c para_server's aac audio format handler. */ + +#include +#include #include "para.h" #include "error.h" -#include "string.h" #include "afh.h" -#include "afs.h" -#include "server.h" +#include "string.h" #include "aac.h" +#include "fd.h" static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip) { @@ -42,19 +44,9 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip) return -E_STSZ; } -static int atom_cmp(unsigned char *buf1, char *buf2) +static int atom_cmp(const unsigned char *buf1, const char *buf2) { - unsigned char *b2 = (unsigned char *)buf2; - - if (buf1[0] != b2[0]) - return 1; - if (buf1[1] != b2[1]) - return 1; - if (buf1[2] != b2[2]) - return 1; - if (buf1[3] != b2[3]) - return 1; - return 0; + return memcmp(buf1, buf2, 4)? 1 : 0; } static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char type[5]) @@ -91,11 +83,9 @@ static char *get_tag(unsigned char *p, int size) return buf; } -static char *read_tags(unsigned char *buf, size_t buflen) +static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi) { unsigned char *p = buf; - char *title = NULL, *artist = NULL, *album = NULL, *year = NULL, - *comment = NULL, *result; while (p + 32 < buf + buflen) { unsigned char *q, type1[5], type2[5]; @@ -113,28 +103,21 @@ static char *read_tags(unsigned char *buf, size_t buflen) q = p + ret + ret2 + 8; if (q + size2 > buf + buflen) break; - if (!atom_cmp(type1, "©ART")) - artist = get_tag(q, size2); - else if (!atom_cmp(type1, "©alb")) - album = get_tag(q, size2); - else if (!atom_cmp(type1, "©nam")) - title = get_tag(q, size2); - else if (!atom_cmp(type1, "©cmt")) - comment = get_tag(q, size2); - else if (!atom_cmp(type1, "©day")) - year = get_tag(q, size2); + if (!atom_cmp(type1, "\xa9" "ART")) + afhi->tags.artist = get_tag(q, size2); + else if (!atom_cmp(type1, "\xa9" "alb")) + afhi->tags.album = get_tag(q, size2); + else if (!atom_cmp(type1, "\xa9" "nam")) + afhi->tags.title = get_tag(q, size2); + else if (!atom_cmp(type1, "\xa9" "cmt")) + afhi->tags.comment = get_tag(q, size2); + else if (!atom_cmp(type1, "\xa9" "day")) + afhi->tags.year = get_tag(q, size2); p += size1; } - result = make_taginfo(title, artist, album, year, comment); - free(title); - free(artist); - free(album); - free(year); - free(comment); - return result; } -static char *read_meta(unsigned char *buf, size_t buflen) +static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi) { unsigned char *p = buf; @@ -145,12 +128,12 @@ static char *read_meta(unsigned char *buf, size_t buflen) continue; } p += 4; - return read_tags(p, buflen - (p - buf)); + return read_tags(p, buflen - (p - buf), afhi); } - return make_taginfo(NULL, NULL, NULL, NULL, NULL); } -static char *aac_get_taginfo(unsigned char *buf, size_t buflen) +static void aac_get_taginfo(unsigned char *buf, size_t buflen, + struct afh_info *afhi) { int i; uint64_t subsize; @@ -165,10 +148,9 @@ static char *aac_get_taginfo(unsigned char *buf, size_t buflen) p = buf + i; i += read_atom_header(p, &subsize, type); p = buf + i; - return read_meta(p, buflen - i); + return read_meta(p, buflen - i, afhi); } PARA_INFO_LOG("no meta data\n"); - return make_taginfo(NULL, NULL, NULL, NULL, NULL); } static ssize_t aac_compute_chunk_table(struct afh_info *afhi, @@ -182,7 +164,7 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi, if (ret < 0) return ret; afhi->chunks_total = ret; - PARA_DEBUG_LOG("sz table has %lu entries\n", afhi->chunks_total); + PARA_DEBUG_LOG("sz table has %" PRIu32 " entries\n", afhi->chunks_total); afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * sizeof(size_t)); for (i = 1; i <= afhi->chunks_total; i++) { if (skip + 4 > numbytes) @@ -197,19 +179,18 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi, } static int aac_set_chunk_tv(struct afh_info *afhi, - mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds) + mp4AudioSpecificConfig *mp4ASC, uint32_t *seconds) { float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023; struct timeval total; - long unsigned ms = 1000.0 * afhi->chunks_total * tmp - / mp4ASC->samplingFrequency; + long unsigned ms; if (!mp4ASC->samplingFrequency) return -E_MP4ASC; ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency; ms2tv(ms, &total); tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv); - PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n", + PARA_INFO_LOG("%luHz, %lus (%" PRIu32 " x %lums)\n", mp4ASC->samplingFrequency, ms / 1000, afhi->chunks_total, tv2ms(&afhi->chunk_tv)); if (ms < 1000) @@ -232,12 +213,11 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd, mp4AudioSpecificConfig mp4ASC; NeAACDecHandle handle = NULL; unsigned char *umap = (unsigned char *) map; - char *taginfo; ret = aac_find_esds(umap, numbytes, &skip, &decoder_len); if (ret < 0) goto out; - taginfo = aac_get_taginfo(umap, numbytes); + aac_get_taginfo(umap, numbytes, afhi); handle = aac_open(); ret = -E_AAC_AFH_INIT; if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels)) @@ -268,11 +248,6 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd, ret = (afhi->chunk_table[afhi->chunks_total] - afhi->chunk_table[0]) * 8; /* bits */ ret += (channels * afhi->seconds_total * 500); /* avoid rounding error */ afhi->bitrate = ret / (channels * afhi->seconds_total * 1000); - afhi->info_string = make_message("%s:\n%s", - status_item_list[SI_AUDIO_FILE_INFO], - taginfo); - free(taginfo); - tv_scale(20, &afhi->chunk_tv, &afhi->eof_tv); ret = 1; out: if (handle) @@ -280,6 +255,68 @@ out: return ret; } +static int aac_rewrite_tags(const char *map, size_t mapsize, + struct taginfo *tags, int fd, const char *filename) +{ + MP4FileHandle h; + const MP4Tags *mdata; + int ret = write_all(fd, map, mapsize); + + if (ret < 0) + return ret; + lseek(fd, 0, SEEK_SET); + h = MP4Modify(filename, 0); + if (!h) { + PARA_ERROR_LOG("MP4Modify() failed, fd = %d\n", fd); + return -E_MP4V2; + } + mdata = MP4TagsAlloc(); + assert(mdata); + if (!MP4TagsFetch(mdata, h)) { + PARA_ERROR_LOG("MP4Tags_Fetch() failed\n"); + ret = -E_MP4V2; + goto close; + } + + if (!MP4TagsSetAlbum(mdata, tags->album)) { + PARA_ERROR_LOG("Could not set album\n"); + ret = -E_MP4V2; + goto tags_free; + } + if (!MP4TagsSetArtist(mdata, tags->artist)) { + PARA_ERROR_LOG("Could not set album\n"); + ret = -E_MP4V2; + goto tags_free; + } + if (!MP4TagsSetComments(mdata, tags->comment)) { + PARA_ERROR_LOG("Could not set comment\n"); + ret = -E_MP4V2; + goto tags_free; + } + if (!MP4TagsSetName(mdata, tags->title)) { + PARA_ERROR_LOG("Could not set title\n"); + ret = -E_MP4V2; + goto tags_free; + } + if (!MP4TagsSetReleaseDate(mdata, tags->year)) { + PARA_ERROR_LOG("Could not set release date\n"); + ret = -E_MP4V2; + goto tags_free; + } + + if (!MP4TagsStore(mdata, h)) { + PARA_ERROR_LOG("Could not store tags\n"); + ret = -E_MP4V2; + goto tags_free; + } + ret = 1; +tags_free: + MP4TagsFree(mdata); +close: + MP4Close(h, 0); + return ret; +} + static const char* aac_suffixes[] = {"m4a", "mp4", NULL}; /** * the init function of the aac audio format handler @@ -290,4 +327,5 @@ 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_rewrite_tags; }