X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=d0be0ad95459390e37879870b349e88783618509;hp=dde71c505f8180d103d03d387e366a0427ccec4c;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=f6f50d03a09d6bc423324206d274336e9905bbb4;ds=sidebyside diff --git a/mp3_afh.c b/mp3_afh.c index dde71c50..d0be0ad9 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2007 Andre Noll + * Copyright (C) 2003-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -16,8 +16,11 @@ * Johannes Overmann */ -#include "server.h" +#include + +#include "para.h" #include "error.h" +#include "afh.h" #include "string.h" /** \cond some defines and structs which are only used in this file */ @@ -44,21 +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 { - struct mp3header header; - int id3_isvalid; - struct id3tag id3; - int vbr; -}; - /** \endcond */ static const int frequencies[3][4] = { {22050,24000,16000,50000}, /* MPEG 2.0 */ @@ -83,7 +71,156 @@ 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); +} + +static 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 void mp3_get_id3(__a_unused unsigned char *map, + __a_unused size_t numbytes, int fd, 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 (!tags->title) + tags->title = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TPE1")) { + if (!tags->artist) + tags->artist = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TALB")) { + if (!tags->album) + tags->album = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "TDRC")) { + if (!tags->year) + tags->year = get_strings(fr); + continue; + } + if (!strcmp(fr->id, "COMM")) { + if (!tags->comment) + tags->comment = get_strings(fr); + continue; + } + } + id3_file_close(id3_f); +} + +#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 void 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]; + off_t fpos; + + if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) { + PARA_DEBUG_LOG("no id3 v1 tag\n"); + return; + } + 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); + tags->artist = para_strdup(artist); + tags->title = para_strdup(title); + tags->year = para_strdup(year); + tags->album = para_strdup(album); + tags->comment = para_strdup(comment); +} +#endif /* HAVE_LIBID3TAG */ static int header_frequency(struct mp3header *h) { @@ -131,42 +268,9 @@ static int frame_length(struct mp3header *header) + header->padding; } -static void write_info_str(struct audio_format_info *afi) -{ - int v = mp3.id3_isvalid; - - snprintf(afi->info_string, MMD_INFO_SIZE, - "audio_file_info1:%lu x %lums, %u kbit/s (%cbr) %i KHz %s\n" - "audio_file_info2:%s, by %s\n" - "audio_file_info3:A: %s, Y: %s, C: %s\n", - afi->chunks_total, - tv2ms(&afi->chunk_tv), - afi->bitrate, - mp3.vbr? 'v' : 'c', - afi->frequency / 1000, - header_mode(&mp3.header), - v && *mp3.id3.title? mp3.id3.title : "(title tag not set)", - v && *mp3.id3.artist? mp3.id3.artist : "(artist tag not set)", - 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 (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) && @@ -227,7 +331,8 @@ out: * Return the length of the next frame header or zero if the end of the file is * reached. */ -static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos) +static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos, + struct mp3header *result) { int k, l = 0, first_len; struct mp3header h, h2; @@ -250,60 +355,23 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos } if (k == MIN_CONSEC_GOOD_FRAMES) { *fpos = valid_start; - memcpy(&(mp3.header), &h2, sizeof(struct mp3header)); + *result = h2; return first_len; } } 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_INFO_LOG("%s", "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) +static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos, + struct mp3header *header) { int frame_len; - frame_len = get_header(map, numbytes, fpos, &mp3.header); + frame_len = get_header(map, numbytes, fpos, header); if (frame_len < 0) return frame_len; if (!frame_len) { - frame_len = mp3_seek_next_header(map, numbytes, fpos); + frame_len = mp3_seek_next_header(map, numbytes, fpos, header); if (frame_len <= 0) return frame_len; } else @@ -313,36 +381,42 @@ 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, - struct audio_format_info *afi) +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; + uint64_t freq_sum = 0, br_sum = 0; + int fl = 0, 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; - afi->chunks_total = 0; - afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); - mp3_get_id3(map, numbytes, &fpos); - fpos = 0; - mp3.vbr = 0; + afhi->chunks_total = 0; + afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t)); while (1) { - unsigned long freq, br, fl; + int freq, br; struct timeval tmp, cct; /* current chunk time */ fpos += len; - len = find_valid_start(map, numbytes, &fpos); - if (len <= 0) + len = find_valid_start(map, numbytes, &fpos, &header); + if (len <= 0) { + size_t end; + ret = -E_MP3_INFO; + if (!afhi->chunks_total) + goto err_out; + end = afhi->chunk_table[afhi->chunks_total - 1] + fl; + afhi->chunk_table[afhi->chunks_total] + = PARA_MIN(end, numbytes); break; - ret = header_frequency(&mp3.header); + } + ret = header_frequency(&header); if (ret < 0) continue; freq = ret; - ret = header_bitrate(&mp3.header); + ret = header_bitrate(&header); if (ret < 0) continue; br = ret; - ret = frame_length(&mp3.header); + ret = frame_length(&header); if (ret < 0) continue; fl = ret; @@ -351,64 +425,51 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, tv_divide(br * 125, &tmp, &cct); tv_add(&cct, &total_time, &tmp); total_time = tmp; - //PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec); - if (afi->chunks_total >= chunk_table_size) { + if (afhi->chunks_total >= chunk_table_size) { chunk_table_size *= 2; - afi->chunk_table = para_realloc(afi->chunk_table, - chunk_table_size * sizeof(size_t)); - } - afi->chunk_table[afi->chunks_total] = fpos; -// if (afi->chunks_total < 10 || !(afi->chunks_total % 1000)) -// PARA_INFO_LOG("chunk #%lu: %zd\n", afi->chunks_total, -// afi->chunk_table[afi->chunks_total]); - afi->chunks_total++; - if (afi->chunks_total == 1) { - freq_avg = freq; - br_avg = br; - old_br = br; - fl_avg = fl; - continue; + afhi->chunk_table = para_realloc(afhi->chunk_table, + chunk_table_size * sizeof(uint32_t)); } - freq_avg += ((long)freq - freq_avg) / ((long)afi->chunks_total + 1); - fl_avg += ((long)fl - fl_avg) / ((long)afi->chunks_total + 1); - br_avg += ((long)br - br_avg) / ((long)afi->chunks_total + 1); - if (old_br != br) - mp3.vbr = 1; + afhi->chunk_table[afhi->chunks_total] = fpos; + afhi->chunks_total++; + freq_sum += freq; + br_sum += br; + if (afhi->chunks_total != 1 && old_br != br) + vbr = 1; old_br = br; } ret = -E_MP3_INFO; - if (!afi->chunks_total || !freq_avg || !br_avg) + if (!freq_sum || !br_sum) goto err_out; - afi->chunk_table[afi->chunks_total] = numbytes - 1; - afi->bitrate = br_avg; - afi->frequency = freq_avg; - afi->channels = header_channels(&mp3.header); - afi->seconds_total = (tv2ms(&total_time) + 500) / 1000; - tv_divide(afi->chunks_total, &total_time, &afi->chunk_tv); - PARA_DEBUG_LOG("%lu chunks, each %lums\n", afi->chunks_total, - tv2ms(&afi->chunk_tv)); - tv_scale(3, &afi->chunk_tv, &afi->eof_tv); - PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv)); + afhi->bitrate = br_sum / afhi->chunks_total; + afhi->frequency = freq_sum / afhi->chunks_total; + afhi->channels = header_channels(&header); + afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000; + 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); return 1; err_out: - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - free(afi->chunk_table); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + free(afhi->chunk_table); return ret; } /* * Read mp3 information from audio file */ -int mp3_get_file_info(char *map, size_t numbytes, - struct audio_format_info *afi) +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, afi); + ret = mp3_read_info((unsigned char *)map, numbytes, fd, afhi); if (ret < 0) return ret; - write_info_str(afi); - if (afi->seconds_total < 2 || !afi->chunks_total) + if (afhi->seconds_total < 2 || !afhi->chunks_total) return -E_MP3_INFO; return 1; }