X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=c49f30dea858f05c627a820685fd6538b55eb07d;hp=94b0f8b34cdb69787c86ae2dd333d7a3b1914e84;hb=8eaa28075189eea5db470422e8b4110df723cce3;hpb=92f089b820b45a5dbdc5b4f69d596105d5acba68 diff --git a/aac_afh.c b/aac_afh.c index 94b0f8b3..c49f30de 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 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 "afh.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,25 +44,15 @@ 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]) { int i; - uint64_t size = (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3]; + uint64_t size = aac_read_int32(buf); memcpy(type, buf + 4, 4); type[4] = '\0'; @@ -111,15 +103,15 @@ static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi) q = p + ret + ret2 + 8; if (q + size2 > buf + buflen) break; - if (!atom_cmp(type1, "©ART")) + if (!atom_cmp(type1, "\xa9" "ART")) afhi->tags.artist = get_tag(q, size2); - else if (!atom_cmp(type1, "©alb")) + else if (!atom_cmp(type1, "\xa9" "alb")) afhi->tags.album = get_tag(q, size2); - else if (!atom_cmp(type1, "©nam")) + else if (!atom_cmp(type1, "\xa9" "nam")) afhi->tags.title = get_tag(q, size2); - else if (!atom_cmp(type1, "©cmt")) + else if (!atom_cmp(type1, "\xa9" "cmt")) afhi->tags.comment = get_tag(q, size2); - else if (!atom_cmp(type1, "©day")) + else if (!atom_cmp(type1, "\xa9" "day")) afhi->tags.year = get_tag(q, size2); p += size1; } @@ -172,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) @@ -187,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) @@ -264,7 +255,69 @@ out: return ret; } -static const char* aac_suffixes[] = {"m4a", "mp4", NULL}; +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 * const aac_suffixes[] = {"m4a", "mp4", NULL}; /** * the init function of the aac audio format handler * @@ -274,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; }