X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=1c7fd706f0a7c9fe8c9d4d8db43846be18a9304d;hp=d12dfa19ca8eb59f7a47951665941d63fd8ba1a6;hb=bc78a94412b17dfd445d6bb88f752041df3cf7ba;hpb=29a8e4384c08cb4e295e5b82994e62bf247a0ef7 diff --git a/aac_afh.c b/aac_afh.c index d12dfa19..1c7fd706 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,59 +8,51 @@ * 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 "portable_io.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) +static int aac_find_stsz(char *buf, size_t buflen, off_t *skip) { int i; for (i = 0; i + 16 < buflen; i++) { - unsigned char *p = buf + i; + char *p = buf + i; unsigned sample_count, sample_size; if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z') continue; PARA_DEBUG_LOG("found stsz@%d\n", i); i += 8; - sample_size = aac_read_int32(buf + i); - PARA_DEBUG_LOG("sample size: %d\n", sample_size); + sample_size = read_u32_be(buf + i); + PARA_DEBUG_LOG("sample size: %u\n", sample_size); i += 4; - sample_count = aac_read_int32(buf + i); + sample_count = read_u32_be(buf + i); i += 4; - PARA_DEBUG_LOG("sample count: %d\n", sample_count); + PARA_DEBUG_LOG("sample count: %u\n", sample_count); *skip = i; return sample_count; } return -E_STSZ; } -static int atom_cmp(unsigned char *buf1, char *buf2) +static int atom_cmp(const 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]) +static int read_atom_header(char *buf, uint64_t *subsize, char type[5]) { - int i; - uint64_t size = (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3]; + uint64_t size = read_u32_be(buf); memcpy(type, buf + 4, 4); type[4] = '\0'; @@ -72,13 +64,12 @@ static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char } buf += 4; size = 0; - for (i = 0; i < 8; i++) - size |= ((uint64_t)buf[i]) << ((7 - i) * 8); + size = read_u64_be(buf); *subsize = size; return 16; } -static char *get_tag(unsigned char *p, int size) +static char *get_tag(char *p, int size) { char *buf; @@ -91,12 +82,12 @@ static char *get_tag(unsigned char *p, int size) return buf; } -static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi) +static void read_tags(char *buf, size_t buflen, struct afh_info *afhi) { - unsigned char *p = buf; + char *p = buf; while (p + 32 < buf + buflen) { - unsigned char *q, type1[5], type2[5]; + char *q, type1[5], type2[5]; uint64_t size1, size2; int ret, ret2; @@ -111,23 +102,23 @@ 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; } } -static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi) +static void read_meta(char *buf, size_t buflen, struct afh_info *afhi) { - unsigned char *p = buf; + char *p = buf; while (p + 4 < buf + buflen) { @@ -140,15 +131,14 @@ static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi) } } -static void aac_get_taginfo(unsigned char *buf, size_t buflen, - struct afh_info *afhi) +static void aac_get_taginfo(char *buf, size_t buflen, struct afh_info *afhi) { int i; uint64_t subsize; - unsigned char type[5]; + char type[5]; for (i = 0; i + 24 < buflen; i++) { - unsigned char *p = buf + i; + char *p = buf + i; if (p[0] != 'm' || p[1] != 'e' || p[2] != 't' || p[3] != 'a') continue; PARA_INFO_LOG("found metadata at offset %d\n", i); @@ -162,7 +152,7 @@ static void aac_get_taginfo(unsigned char *buf, size_t buflen, } static ssize_t aac_compute_chunk_table(struct afh_info *afhi, - unsigned char *map, size_t numbytes) + char *map, size_t numbytes) { int ret, i; size_t sum = 0; @@ -172,12 +162,12 @@ 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) break; - sum += aac_read_int32(map + skip); + sum += read_u32_be(map + skip); afhi->chunk_table[i] = sum; skip += 4; // if (i < 10 || i + 10 > afhi->chunks_total) @@ -187,19 +177,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) @@ -221,32 +210,33 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd, unsigned char channels = 0; mp4AudioSpecificConfig mp4ASC; NeAACDecHandle handle = NULL; - unsigned char *umap = (unsigned char *) map; - ret = aac_find_esds(umap, numbytes, &skip, &decoder_len); + ret = aac_find_esds(map, numbytes, &skip, &decoder_len); if (ret < 0) goto out; - aac_get_taginfo(umap, numbytes, afhi); + aac_get_taginfo(map, numbytes, afhi); handle = aac_open(); ret = -E_AAC_AFH_INIT; - if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels)) + if (NeAACDecInit(handle, (unsigned char *)map + skip, decoder_len, + &rate, &channels)) goto out; if (!channels) goto out; PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels); ret = -E_MP4ASC; - if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC)) + if (NeAACDecAudioSpecificConfig((unsigned char *)map + skip, + numbytes - skip, &mp4ASC)) goto out; if (!mp4ASC.samplingFrequency) goto out; - ret = aac_compute_chunk_table(afhi, umap, numbytes); + ret = aac_compute_chunk_table(afhi, map, numbytes); if (ret < 0) goto out; skip = ret; ret = aac_set_chunk_tv(afhi, &mp4ASC, &afhi->seconds_total); if (ret < 0) goto out; - ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip); + ret = aac_find_entry_point(map + skip, numbytes - skip, &skip); if (ret < 0) goto out; afhi->chunk_table[0] = ret; @@ -264,7 +254,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 +326,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; }