X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=8d4a5416308b140b34bfc68ce707b477ce92d01d;hp=83678389a8c21f211f2f55dea9157eb89412e1ca;hb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b;hpb=e58f86238842bc1f47f7b9b5757c384625ceb8b2 diff --git a/mp3_afh.c b/mp3_afh.c index 83678389..8d4a5416 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -28,12 +28,8 @@ * Johannes Overmann */ -#include "server.cmdline.h" #include "server.h" -#include "vss.h" -#include "afh.h" #include "error.h" -#include "fd.h" #include "string.h" /** \cond some defines and structs which are only used in this file */ @@ -43,7 +39,6 @@ * to see before we decide we are looking at a real MP3 file */ #define MIN_CONSEC_GOOD_FRAMES 4 - #define FRAME_HEADER_SIZE 4 #define MIN_FRAME_SIZE 21 @@ -70,24 +65,20 @@ struct id3tag { }; struct mp3info { - char *filename; struct mp3header header; int id3_isvalid; struct id3tag id3; int vbr; - long unsigned br_average; - long unsigned seconds; - int freq; }; /** \endcond */ -static int frequencies[3][4] = { +static const int frequencies[3][4] = { {22050,24000,16000,50000}, /* MPEG 2.0 */ {44100,48000,32000,50000}, /* MPEG 1.0 */ {11025,12000,8000,50000} /* MPEG 2.5 */ }; -static int mp3info_bitrate[2][3][14] = { +static const int mp3info_bitrate[2][3][14] = { { /* MPEG 2.0 */ {32,48,56,64,80,96,112,128,144,160,176,192,224,256}, /* layer 1 */ {8,16,24,32,40,48,56,64,80,96,112,128,144,160}, /* layer 2 */ @@ -101,13 +92,10 @@ static int mp3info_bitrate[2][3][14] = { } }; -static int frame_size_index[] = {24000, 72000, 72000}; +static const int frame_size_index[] = {24000, 72000, 72000}; static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"}; -static FILE *infile; static struct mp3info mp3; -static struct audio_format_handler *af; -static ssize_t *chunk_table, num_chunks; static int header_frequency(struct mp3header *h) { @@ -122,9 +110,19 @@ static const char *header_mode(struct mp3header *h) h->mode = 4; /* invalid */ return mode_text[h->mode]; } + +static int header_channels(struct mp3header *h) +{ + if (h->mode > 3) + return 0; + if (h->mode < 3) + return 2; + return 1; +} + static int header_bitrate(struct mp3header *h) { - if (h->layer > 3 || h->bitrate > 14) + if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate) return -E_HEADER_BITRATE; return mp3info_bitrate[h->version & 1][3 - h->layer][h->bitrate - 1]; } @@ -145,19 +143,19 @@ static int frame_length(struct mp3header *header) + header->padding; } -static void write_info_str(char *info_str) +static void write_info_str(struct audio_format_info *afi) { int v = mp3.id3_isvalid; - snprintf(info_str, MMD_INFO_SIZE, - "audio_file_info1:%d x %lums, %lu kbit/s (%cbr) %i KHz %s\n" + 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", - num_chunks, - tv2ms(&af->chunk_tv), - mp3.br_average, + afi->chunks_total, + tv2ms(&afi->chunk_tv), + afi->bitrate, mp3.vbr? 'v' : 'c', - mp3.freq / 1000, + 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)", @@ -191,138 +189,115 @@ static int compare_headers(struct mp3header *h1,struct mp3header *h2) (h1->original == h2->original) && (h1->emphasis == h2->emphasis)) return 1; - else - return 0; + return 0; } -/** +/* * get next MP3 frame header. * - * \param stream to read the header from - * \param header structure that gets filled in by get_header() - * - * \return On success, the header frame length is returned. A return value of - * zero means that we did not retrieve a valid frame header, and a negative - * return value indicates an error. + * On success, the header frame length is returned and the given header + * structure that is filled in. A return value of zero means that we did not + * retrieve a valid frame header, and a negative return value indicates an + * error. */ -static int get_header(FILE *file, struct mp3header *header) +static int get_header(unsigned char *map, size_t numbytes, off_t *fpos, + struct mp3header *header) { - unsigned char buffer[FRAME_HEADER_SIZE]; int fl, ret; - if (!file || !header) - return -E_MP3_NO_FILE; - ret = para_fread(buffer, FRAME_HEADER_SIZE, 1, file); - if (ret < FRAME_HEADER_SIZE) { + if (*fpos + FRAME_HEADER_SIZE > numbytes) { + *fpos = numbytes - 1; header->sync = 0; - return ret < 0? ret : 0; + return 0; } - header->layer = (buffer[1] >> 1) & 3; - header->sync = (((int)buffer[0]<<4) | ((int)(buffer[1]&0xE0)>>4)); - if (buffer[1] & 0x10) - header->version = (buffer[1] >> 3) & 1; + header->layer = (map[*fpos + 1] >> 1) & 3; + header->sync = (((int)map[*fpos]<<4) | ((int)(map[*fpos + 1]&0xE0)>>4)); + if (map[*fpos + 1] & 0x10) + header->version = (map[*fpos + 1] >> 3) & 1; else header->version = 2; if ((header->sync != 0xFFE) || (header->layer != 1)) { + ret = 0; header->sync = 0; -// PARA_DEBUG_LOG("%s: header not found\n", __func__); - return 0; + goto out; } - header->crc = buffer[1] & 1; - header->bitrate = (buffer[2] >> 4) & 0x0F; -// PARA_DEBUG_LOG("%s: found header, bitrate: %u\n", __func__, -// header->bitrate); - header->freq = (buffer[2] >> 2) & 0x3; - header->padding = (buffer[2] >>1) & 0x1; - header->mode = (buffer[3] >> 6) & 0x3; + header->crc = map[*fpos + 1] & 1; + header->bitrate = (map[*fpos + 2] >> 4) & 0x0F; + header->freq = (map[*fpos + 2] >> 2) & 0x3; + header->padding = (map[*fpos + 2] >>1) & 0x1; + header->mode = (map[*fpos + 3] >> 6) & 0x3; fl = frame_length(header); - return (fl >= MIN_FRAME_SIZE)? fl : -E_FRAME_LENGTH; + ret = (fl >= MIN_FRAME_SIZE)? fl : -E_FRAME_LENGTH; +out: + *fpos += FRAME_HEADER_SIZE; + return ret; } -/** +/* * find the next mp3 header * - * \return On success, the length of the next frame header. If the end of the - * file was reached, the function returns zero. On errors, a negative value is - * returned. - * + * Return the length of the next frame header or zero if the end of the file is + * reached. */ -static int mp3_seek_next_header(void) +static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos) { - int k, l = 0, c, first_len, ret; + int k, l = 0, first_len; struct mp3header h, h2; long valid_start = 0; - while (1) { - while ((c = fgetc(infile)) != 255 && (c != EOF)) - ; /* nothing */ - if (c != 255) - return 0; - ungetc(c, infile); - valid_start = ftell(infile); - first_len = get_header(infile, &h); + for (; *fpos < numbytes; (*fpos)++) { + if (map[*fpos] != 0xff) + continue; + valid_start = *fpos; + first_len = get_header(map, numbytes, fpos, &h); if (first_len <= 0) continue; - ret = para_fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR); - if (ret < 0) - return ret; + *fpos += first_len - FRAME_HEADER_SIZE; for (k = 1; k < MIN_CONSEC_GOOD_FRAMES; k++) { - if ((l = get_header(infile, &h2)) <= 0) + if ((l = get_header(map, numbytes, fpos, &h2)) <= 0) break; if (!compare_headers(&h, &h2)) break; - ret = para_fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR); - if (ret < 0) - return ret; + *fpos += l - FRAME_HEADER_SIZE; } if (k == MIN_CONSEC_GOOD_FRAMES) { - ret = para_fseek(infile, valid_start, SEEK_SET); - if (ret < 0) - return ret; + *fpos = valid_start; memcpy(&(mp3.header), &h2, sizeof(struct mp3header)); return first_len; } } + return 0; } -static int mp3_get_id3(void) +static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos) { - char fbuf[4]; - int ret; - 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'; - ret = para_fseek(infile, -128, SEEK_END); - if (ret < 0 ) - return ret; - if (para_fread(fbuf, 1, 3, infile) < 0) - return -E_FREAD; - fbuf[3] = '\0'; - if (strcmp("TAG", fbuf)) { + if (numbytes < 128) + return; + *fpos = numbytes - 128; + if (strncmp("TAG", (char *) map + *fpos, 3)) { PARA_INFO_LOG("%s", "no id3 tag\n"); - return 0; + return; } - ret = para_fseek(infile, -125, SEEK_END); - if (ret < 0) - return ret; - if (para_fread(mp3.id3.title, 1, 30, infile) != 30) - return -E_FREAD; + *fpos = numbytes - 125; + memcpy(mp3.id3.title, map + *fpos, 30); + *fpos += 30; mp3.id3.title[30] = '\0'; - if (para_fread(mp3.id3.artist, 1, 30, infile) != 30) - return -E_FREAD; + memcpy(mp3.id3.artist, map + *fpos, 30); + *fpos += 30; mp3.id3.artist[30] = '\0'; - if (para_fread(mp3.id3.album, 1, 30, infile) != 30) - return -E_FREAD; + memcpy(mp3.id3.album, map + *fpos, 30); + *fpos += 30; mp3.id3.album[30] = '\0'; - if (para_fread(mp3.id3.year, 1, 4, infile) != 4) - return -E_FREAD; + memcpy(mp3.id3.year, map + *fpos, 4); + *fpos += 4; mp3.id3.year[4] = '\0'; - if (para_fread(mp3.id3.comment, 1, 30, infile) != 30) - return -E_FREAD; + memcpy(mp3.id3.comment, map + *fpos, 30); mp3.id3.comment[30] = '\0'; mp3.id3_isvalid = 1; unpad(mp3.id3.title); @@ -330,166 +305,135 @@ static int mp3_get_id3(void) unpad(mp3.id3.album); unpad(mp3.id3.year); unpad(mp3.id3.comment); - return 1; } -static int find_valid_start(void) +static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos) { - int ret, frame_len; + int frame_len; - if (!infile) - return -E_MP3_NO_FILE; - frame_len = get_header(infile, &mp3.header); + frame_len = get_header(map, numbytes, fpos, &mp3.header); if (frame_len < 0) return frame_len; if (!frame_len) { - frame_len = mp3_seek_next_header(); + frame_len = mp3_seek_next_header(map, numbytes, fpos); if (frame_len <= 0) return frame_len; - } else { - ret = para_fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR); - if (ret < 0) - return ret; - } + } else + *fpos -= FRAME_HEADER_SIZE; if (frame_len <= 1) return -E_FRAME_LENGTH; return frame_len; } -static int mp3_read_info(void) +static int mp3_read_info(unsigned char *map, size_t numbytes, + struct audio_format_info *afi) { long fl_avg = 0, freq_avg = 0, br_avg = 0; int ret, len = 0, old_br = -1; struct timeval total_time = {0, 0}; unsigned chunk_table_size = 1000; /* gets increased on demand */ + off_t fpos = 0; - num_chunks = 0; - chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); - ret = mp3_get_id3(); - if (ret < 0) - goto err_out; - rewind(infile); + 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; - mp3.freq = 0; while (1) { - int freq, br, fl; + unsigned long freq, br, fl; struct timeval tmp, cct; /* current chunk time */ - if (len > 0) { - ret = para_fseek(infile, len, SEEK_CUR); - if (ret < 0) - goto err_out; - } - len = find_valid_start(); + fpos += len; + len = find_valid_start(map, numbytes, &fpos); if (len <= 0) break; - freq = header_frequency(&mp3.header); - br = header_bitrate(&mp3.header); - fl = frame_length(&mp3.header); - if (freq < 0 || br < 0 || fl < 0) + ret = header_frequency(&mp3.header); + if (ret < 0) continue; + freq = ret; + ret = header_bitrate(&mp3.header); + if (ret < 0) + continue; + br = ret; + ret = frame_length(&mp3.header); + if (ret < 0) + continue; + fl = ret; tmp.tv_sec = fl; tmp.tv_usec = 0; 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 (num_chunks >= chunk_table_size) { + if (afi->chunks_total >= chunk_table_size) { chunk_table_size *= 2; - chunk_table = para_realloc(chunk_table, + afi->chunk_table = para_realloc(afi->chunk_table, chunk_table_size * sizeof(size_t)); } - chunk_table[num_chunks] = ftell(infile); - if (num_chunks < 10 || !(num_chunks % 1000)) - PARA_INFO_LOG("chunk #%d: %zd\n", num_chunks, - chunk_table[num_chunks]); - num_chunks++; - if (num_chunks == 1) { -// entry = ftell(infile); -// PARA_INFO_LOG("entry: %zd\n", entry); + 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; } - freq_avg += (freq - freq_avg) / (num_chunks + 1); - fl_avg += (fl - fl_avg) / (num_chunks + 1); - br_avg += (br - br_avg) / (num_chunks + 1); + 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; old_br = br; } ret = -E_MP3_INFO; - if (!num_chunks || !freq_avg || !br_avg) - goto err_out; - ret= para_fseek(infile, 0, SEEK_END); - if (ret < 0) + if (!afi->chunks_total || !freq_avg || !br_avg) goto err_out; - chunk_table[num_chunks] = ftell(infile); - mp3.br_average = br_avg; - mp3.freq = freq_avg; - mp3.seconds = (tv2ms(&total_time) + 500) / 1000; - tv_divide(num_chunks, &total_time, &af->chunk_tv); - rewind(infile); - PARA_DEBUG_LOG("%zu chunks, each %lums\n", num_chunks, tv2ms(&af->chunk_tv)); - tv_scale(3, &af->chunk_tv, &af->eof_tv); - PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv)); + 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)); return 1; err_out: PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - free(chunk_table); + free(afi->chunk_table); return ret; } /* * Read mp3 information from audio file */ -static int mp3_get_file_info(FILE *audio_file, char *info_str, - long unsigned *frames, int *seconds, size_t **vss_chunk_table) +static int mp3_get_file_info(char *map, size_t numbytes, + struct audio_format_info *afi) { int ret; - if (!audio_file) - return -E_MP3_NO_FILE; - infile = audio_file; - ret = mp3_read_info(); - if (ret < 0) { - infile = NULL; + ret = mp3_read_info((unsigned char *)map, numbytes, afi); + if (ret < 0) return ret; - } - write_info_str(info_str); - *frames = num_chunks; - *seconds = mp3.seconds; - *vss_chunk_table = chunk_table; - if (*seconds < 2 || !*frames) + write_info_str(afi); + if (afi->seconds_total < 2 || !afi->chunks_total) return -E_MP3_INFO; return 1; } -static void mp3_close_audio_file(void) -{ - if (!infile) - return; - fclose(infile); - infile = NULL; - free(chunk_table); -} - static const char* mp3_suffixes[] = {"mp3", NULL}; /** * the init function of the mp3 audio format handler * - * \param p pointer to the struct to initialize + * \param afh pointer to the struct to initialize */ -void mp3_init(struct audio_format_handler *p) +void mp3_init(struct audio_format_handler *afh) { - af = p; - af->get_file_info = mp3_get_file_info; - af->close_audio_file = mp3_close_audio_file; - af->get_header_info = NULL; - /* eof_tv gets overwritten in mp3_get_file_info() */ - af->eof_tv.tv_sec = 0; - af->eof_tv.tv_usec = 100 * 1000; - af->suffixes = mp3_suffixes; + afh->get_file_info = mp3_get_file_info; + afh->suffixes = mp3_suffixes; }