X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=ccd28dadd62b2e37a2b9350414a3036bbd7841d0;hp=d0be0ad95459390e37879870b349e88783618509;hb=9bfd946422ec369c4fd91aa1c674cfb277e8cd9f;hpb=e61e21f2aae608ff694c924cdeb2056ac1136b77 diff --git a/mp3_afh.c b/mp3_afh.c index d0be0ad9..ccd28dad 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2009 Andre Noll + * Copyright (C) 2003 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,8 +23,6 @@ #include "afh.h" #include "string.h" -/** \cond some defines and structs which are only used in this file */ - /* * MIN_CONSEC_GOOD_FRAMES defines how many consecutive valid MP3 frames we need * to see before we decide we are looking at a real MP3 file @@ -47,7 +45,6 @@ struct mp3header { unsigned int emphasis; }; -/** \endcond */ static const int frequencies[3][4] = { {22050,24000,16000,50000}, /* MPEG 2.0 */ {44100,48000,32000,50000}, /* MPEG 1.0 */ @@ -71,15 +68,15 @@ 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"}; -#ifdef HAVE_LIBID3TAG +#ifdef HAVE_ID3TAG #include -static char *get_latin1(id3_ucs4_t const *string) +static char *get_utf8(id3_ucs4_t const *string) { if (!string) return NULL; - return (char *)id3_ucs4_latin1duplicate(string); + return (char *)id3_ucs4_utf8duplicate(string); } static char *get_stringlist(union id3_field *field) @@ -88,7 +85,7 @@ static char *get_stringlist(union id3_field *field) char *result = NULL; for (k = 0; k < nstrings; k++) { - char *tmp = (char *)get_latin1(id3_field_getstrings(field, k)); + char *tmp = (char *)get_utf8(id3_field_getstrings(field, k)); if (result) { char *tmp2 = result; result = make_message("%s %s", tmp2, tmp); @@ -104,7 +101,7 @@ static char *get_string(union id3_field *field) { id3_ucs4_t const *string = id3_field_getfullstring(field); - return get_latin1(string); + return get_utf8(string); } #define FOR_EACH_FIELD(f, j, fr) for (j = 0; j < (fr)->nfields && \ @@ -126,52 +123,67 @@ static char *get_strings(struct id3_frame *fr) return NULL; } -static void mp3_get_id3(__a_unused unsigned char *map, - __a_unused size_t numbytes, int fd, struct taginfo *tags) +/* this only sets values which are undefined so far */ +static void parse_frames(struct id3_tag *id3_t, struct taginfo *tags) { int i; - struct id3_tag *id3_t; - struct id3_file *id3_f = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY); - - if (!id3_f) - return; - id3_t = id3_file_tag(id3_f); - if (!id3_t) { - id3_file_close(id3_f); - return; - } + for (i = 0; i < id3_t->nframes; i++) { struct id3_frame *fr = id3_t->frames[i]; - if (!strcmp(fr->id, "TIT2")) { + if (!strcmp(fr->id, ID3_FRAME_TITLE)) { if (!tags->title) tags->title = get_strings(fr); continue; } - if (!strcmp(fr->id, "TPE1")) { + if (!strcmp(fr->id, ID3_FRAME_ARTIST)) { if (!tags->artist) tags->artist = get_strings(fr); continue; } - if (!strcmp(fr->id, "TALB")) { + if (!strcmp(fr->id, ID3_FRAME_ALBUM)) { if (!tags->album) tags->album = get_strings(fr); continue; } - if (!strcmp(fr->id, "TDRC")) { + if (!strcmp(fr->id, ID3_FRAME_YEAR)) { if (!tags->year) tags->year = get_strings(fr); continue; } - if (!strcmp(fr->id, "COMM")) { + if (!strcmp(fr->id, ID3_FRAME_COMMENT)) { if (!tags->comment) tags->comment = get_strings(fr); continue; } } - id3_file_close(id3_f); } -#else /* HAVE_LIBID3TAG */ +static int mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd, + struct taginfo *tags) +{ + int ret = 0; + struct id3_tag *id3_t; + + /* id3v2 tags are usually located at the beginning. */ + id3_t = id3_tag_parse(map, numbytes); + if (id3_t) { + parse_frames(id3_t, tags); + ret |= 2; + id3_tag_delete(id3_t); + } + /* Also look for an id3v1 tag at the end of the file. */ + if (numbytes >= 128) { + id3_t = id3_tag_parse(map + numbytes - 128, 128); + if (id3_t) { + parse_frames(id3_t, tags); + ret |= 1; + id3_tag_delete(id3_t); + } + } + return ret; +} + +#else /* HAVE_ID3TAG */ /* * Remove trailing whitespace from the end of a string @@ -184,7 +196,7 @@ static char *unpad(char *string) return string; } -static void mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd, +static int mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd, struct taginfo *tags) { char title[31], artist[31], album[31], year[5], comment[31]; @@ -192,7 +204,7 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd, if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) { PARA_DEBUG_LOG("no id3 v1 tag\n"); - return; + return 0; } fpos = numbytes - 125; memcpy(title, map + fpos, 30); @@ -219,8 +231,9 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd, tags->year = para_strdup(year); tags->album = para_strdup(album); tags->comment = para_strdup(comment); + return 1; } -#endif /* HAVE_LIBID3TAG */ +#endif /* HAVE_ID3TAG */ static int header_frequency(struct mp3header *h) { @@ -390,6 +403,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, unsigned chunk_table_size = 1000; /* gets increased on demand */ off_t fpos = 0; struct mp3header header; + const char *tag_versions[] = {"no", "id3v1", "id3v2", "id3v1+id3v2"}; afhi->chunks_total = 0; afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t)); @@ -420,7 +434,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, if (ret < 0) continue; fl = ret; - tmp.tv_sec = fl; + tmp.tv_sec = fl - header.padding; tmp.tv_usec = 0; tv_divide(br * 125, &tmp, &cct); tv_add(&cct, &total_time, &tmp); @@ -448,9 +462,9 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd, tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv); PARA_DEBUG_LOG("%lu chunks, each %lums\n", afhi->chunks_total, tv2ms(&afhi->chunk_tv)); - afhi->techinfo = make_message("%cbr, %s", vbr? 'v' : 'c', - header_mode(&header)); - mp3_get_id3(map, numbytes, fd, &afhi->tags); + ret = mp3_get_id3(map, numbytes, fd, &afhi->tags); + afhi->techinfo = make_message("%cbr, %s, %s tags", vbr? 'v' : 'c', + header_mode(&header), tag_versions[ret]); return 1; err_out: PARA_ERROR_LOG("%s\n", para_strerror(-ret));