X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=f7334488113ad85922313f5273fb998df36840a6;hp=18f5dc48e0d407cd30b71c50e4b75fa5385fa338;hb=a6cbab95272b31c55b2b41e1d3dd55743c7c774f;hpb=953ac40963e18afea532eea2fb4c4323afff40d9 diff --git a/mp3_afh.c b/mp3_afh.c index 18f5dc48..f7334488 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2008 Andre Noll + * Copyright (C) 2003-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -47,20 +47,6 @@ struct mp3header { unsigned int emphasis; }; -struct id3tag { - char title[31]; - char artist[31]; - char album[31]; - char year[5]; - char comment[31]; -}; - -struct mp3info { - int id3_isvalid; - struct id3tag id3; - int vbr; -}; - /** \endcond */ static const int frequencies[3][4] = { {22050,24000,16000,50000}, /* MPEG 2.0 */ @@ -85,7 +71,166 @@ static const int mp3info_bitrate[2][3][14] = { static const int frame_size_index[] = {24000, 72000, 72000}; static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"}; -static struct mp3info mp3; +#ifdef HAVE_LIBID3TAG + +#include + +static char *get_latin1(id3_ucs4_t const *string) +{ + if (!string) + return NULL; + return (char *)id3_ucs4_latin1duplicate(string); +} + +char *get_stringlist(union id3_field *field) +{ + unsigned int k, nstrings = id3_field_getnstrings(field); + char *result = NULL; + + for (k = 0; k < nstrings; k++) { + char *tmp = (char *)get_latin1(id3_field_getstrings(field, k)); + if (result) { + char *tmp2 = result; + result = make_message("%s %s", tmp2, tmp); + free(tmp); + free(tmp2); + } else + result = tmp; + } + return result; +} + +static char *get_string(union id3_field *field) +{ + id3_ucs4_t const *string = id3_field_getfullstring(field); + + return get_latin1(string); +} + +#define FOR_EACH_FIELD(f, j, fr) for (j = 0; j < (fr)->nfields && \ + (f = id3_frame_field((fr), j)); j++) + +static char *get_strings(struct id3_frame *fr) +{ + int j; + union id3_field *field; + + FOR_EACH_FIELD(field, j, fr) { + enum id3_field_type type = id3_field_type(field); + + if (type == ID3_FIELD_TYPE_STRINGLIST) + return get_stringlist(field); + if (type == ID3_FIELD_TYPE_STRINGFULL) + return get_string(field); + } + return NULL; +} + +static char *mp3_get_id3(__a_unused unsigned char *map, + __a_unused size_t numbytes, int fd) +{ + int i; + struct id3_tag *id3_t; + char *title = NULL, *artist = NULL, *album = NULL, *year = NULL, + *comment = NULL, *result; + struct id3_file *id3_f = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY); + + if (!id3_f) + goto no_tag; + id3_t = id3_file_tag(id3_f); + if (!id3_t) + goto no_tag; + for (i = 0; i < id3_t->nframes; i++) { + struct id3_frame *fr = id3_t->frames[i]; + if (!strcmp(fr->id, "TIT2")) { + if (!title) + title = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TPE1")) { + if (!artist) + artist = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TALB")) { + if (!album) + album = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TDRC")) { + if (!year) + year = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "COMM")) { + if (!comment) + comment = get_strings(fr); + continue; + } + } + id3_file_close(id3_f); + result = make_taginfo(title, artist, album, year, comment); + free(title); + free(artist); + free(album); + free(year); + free(comment); + return result; +no_tag: + if (id3_f) + id3_file_close(id3_f); + return make_message("%s: (no id3 v1/v2 tag)\n%s:\n", + status_item_list[SI_TAGINFO1], + status_item_list[SI_TAGINFO2]); +} + +#else /* HAVE_LIBID3TAG */ + +/* + * Remove trailing whitespace from the end of a string + */ +static char *unpad(char *string) +{ + char *pos = string + strlen(string) - 1; + while (para_isspace(pos[0])) + (pos--)[0] = 0; + return string; +} + +static char *mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd) +{ + char title[31], artist[31], album[31], year[5], comment[31]; + off_t fpos; + + if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) { + PARA_DEBUG_LOG("no id3 v1 tag\n"); + return make_message("%s: (no id3 v1 tag)\n%s:\n", + status_item_list[SI_TAGINFO1], + status_item_list[SI_TAGINFO2]); + } + fpos = numbytes - 125; + memcpy(title, map + fpos, 30); + fpos += 30; + title[30] = '\0'; + memcpy(artist, map + fpos, 30); + fpos += 30; + artist[30] = '\0'; + memcpy(album, map + fpos, 30); + fpos += 30; + album[30] = '\0'; + memcpy(year, map + fpos, 4); + fpos += 4; + year[4] = '\0'; + memcpy(comment, map + fpos, 30); + comment[30] = '\0'; + unpad(title); + unpad(artist); + unpad(album); + unpad(year); + unpad(comment); + return make_taginfo(title, artist, album, year, comment); +} +#endif /* HAVE_LIBID3TAG */ static int header_frequency(struct mp3header *h) { @@ -133,43 +278,9 @@ static int frame_length(struct mp3header *header) + header->padding; } -static void write_info_str(struct afh_info *afhi, struct mp3header *header) -{ - int v = mp3.id3_isvalid; - - afhi->info_string = make_message( - "%s: %cbr, %s\n" /* audio file info*/ - "%s: %s, by %s\n" /* taginfo1 */ - "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/ - status_item_list[SI_AUDIO_FILE_INFO], mp3.vbr? 'v' : 'c', - header_mode(header), - status_item_list[SI_TAGINFO1], v && *mp3.id3.title? - mp3.id3.title : "(title tag not set)", - v && *mp3.id3.artist? - mp3.id3.artist : "(artist tag not set)", - status_item_list[SI_TAGINFO2], - v && *mp3.id3.album? - mp3.id3.album : "(album tag not set)", - v && *mp3.id3.year? mp3.id3.year : "????", - v && *mp3.id3.comment? - mp3.id3.comment : "(comment tag not set)" - ); -} - -/* - * Remove trailing whitespace from the end of a string - */ -static char *unpad(char *string) -{ - char *pos = string + strlen(string) - 1; - while (para_isspace(pos[0])) - (pos--)[0] = 0; - return string; -} - static int compare_headers(struct mp3header *h1,struct mp3header *h2) { - if ((*(uint*)h1) == (*(uint*)h2)) + if ((*(unsigned int*)h1) == (*(unsigned int*)h2)) return 1; if ((h1->version == h2->version) && (h1->layer == h2->layer) && @@ -261,46 +372,6 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos return 0; } -static void mp3_get_id3(unsigned char *map, size_t numbytes) -{ - off_t fpos; - - mp3.id3_isvalid = 0; - mp3.id3.title[0] = '\0'; - mp3.id3.artist[0] = '\0'; - mp3.id3.album[0] = '\0'; - mp3.id3.comment[0] = '\0'; - mp3.id3.year[0] = '\0'; - if (numbytes < 128) - return; - fpos = numbytes - 128; - if (strncmp("TAG", (char *) map + fpos, 3)) { - PARA_DEBUG_LOG("no id3 tag\n"); - return; - } - fpos = numbytes - 125; - memcpy(mp3.id3.title, map + fpos, 30); - fpos += 30; - mp3.id3.title[30] = '\0'; - memcpy(mp3.id3.artist, map + fpos, 30); - fpos += 30; - mp3.id3.artist[30] = '\0'; - memcpy(mp3.id3.album, map + fpos, 30); - fpos += 30; - mp3.id3.album[30] = '\0'; - memcpy(mp3.id3.year, map + fpos, 4); - fpos += 4; - mp3.id3.year[4] = '\0'; - memcpy(mp3.id3.comment, map + fpos, 30); - mp3.id3.comment[30] = '\0'; - mp3.id3_isvalid = 1; - unpad(mp3.id3.title); - unpad(mp3.id3.artist); - unpad(mp3.id3.album); - unpad(mp3.id3.year); - unpad(mp3.id3.comment); -} - static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos, struct mp3header *header) { @@ -320,20 +391,20 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos, return frame_len; } -static int mp3_read_info(unsigned char *map, size_t numbytes, +static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, struct afh_info *afhi) { - long fl_avg = 0, freq_avg = 0, br_avg = 0; - int ret, len = 0, old_br = -1; + long freq_avg = 0, br_avg = 0; + int ret, len = 0, old_br = -1, vbr = 0; struct timeval total_time = {0, 0}; unsigned chunk_table_size = 1000; /* gets increased on demand */ off_t fpos = 0; struct mp3header header; + char *taginfo; afhi->chunks_total = 0; afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); - mp3_get_id3(map, numbytes); - mp3.vbr = 0; + taginfo = mp3_get_id3(map, numbytes, fd); while (1) { unsigned long freq, br, fl; struct timeval tmp, cct; /* current chunk time */ @@ -373,14 +444,12 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, freq_avg = freq; br_avg = br; old_br = br; - fl_avg = fl; continue; } freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1); - fl_avg += ((long)fl - fl_avg) / ((long)afhi->chunks_total + 1); br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1); if (old_br != br) - mp3.vbr = 1; + vbr = 1; old_br = br; } ret = -E_MP3_INFO; @@ -396,9 +465,13 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, tv2ms(&afhi->chunk_tv)); tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv); PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv)); - write_info_str(afhi, &header); + afhi->info_string = make_message("%s: %cbr, %s\n%s", + status_item_list[SI_AUDIO_FILE_INFO], vbr? 'v' : 'c', + header_mode(&header), taginfo); + free(taginfo); return 1; err_out: + free(taginfo); PARA_ERROR_LOG("%s\n", para_strerror(-ret)); free(afhi->chunk_table); return ret; @@ -407,12 +480,12 @@ err_out: /* * Read mp3 information from audio file */ -int mp3_get_file_info(char *map, size_t numbytes, +static int mp3_get_file_info(char *map, size_t numbytes, int fd, struct afh_info *afhi) { int ret; - ret = mp3_read_info((unsigned char *)map, numbytes, afhi); + ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi); if (ret < 0) return ret; if (afhi->seconds_total < 2 || !afhi->chunks_total)