X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3_afh.c;h=969a230c8d5172bb5a0fe73e8c64eb23aea9230b;hp=ca487efc40abfde3a2778ae3b9b63ecfd36c8613;hb=becb57ea3aec697bfe953a0c3608e4c255b6d24b;hpb=075a9c88085a4925bcb44857de3d025aa3cdd398 diff --git a/mp3_afh.c b/mp3_afh.c index ca487efc..969a230c 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2003-2007 Andre Noll + * Copyright (C) 2003-2009 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file mp3_afh.c para_server's mp3 audio format handler */ @@ -28,13 +16,13 @@ * Johannes Overmann */ -#include "server.cmdline.h" -#include "server.h" -#include "vss.h" -#include "afh.h" +#include +#include "para.h" #include "error.h" -#include "fd.h" +#include "afh.h" #include "string.h" +#include "afs.h" +#include "server.h" /** \cond some defines and structs which are only used in this file */ @@ -43,10 +31,8 @@ * 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 -#define DEFAULT_INBUF_SIZE 8192 struct mp3header { unsigned long sync; @@ -62,33 +48,14 @@ struct mp3header { unsigned int emphasis; }; -struct id3tag { - char title[31]; - char artist[31]; - char album[31]; - char year[5]; - char comment[31]; -}; - -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 */ @@ -102,15 +69,169 @@ 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 char *inbuf; -static size_t inbuf_size; -static struct audio_format_handler *af; -static ssize_t *chunk_table, num_chunks; +#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 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) { @@ -125,9 +246,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]; } @@ -148,42 +279,9 @@ static int frame_length(struct mp3header *header) + header->padding; } -static void write_info_str(char *info_str) -{ - 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" - "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, - mp3.vbr? 'v' : 'c', - mp3.freq / 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) && @@ -194,334 +292,214 @@ 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, + struct mp3header *result) { - int k, l = 0, c, first_len; + 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; - if (fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR) < 0) - return -E_FSEEK; + *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; - fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR); + *fpos += l - FRAME_HEADER_SIZE; } if (k == MIN_CONSEC_GOOD_FRAMES) { - fseek(infile, valid_start, SEEK_SET); - memcpy(&(mp3.header), &h2, sizeof(struct mp3header)); + *fpos = valid_start; + *result = h2; return first_len; } } + return 0; } -static int mp3_get_id3(void) -{ - char fbuf[4]; - - 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 (fseek(infile, -128, SEEK_END)) - return -E_FSEEK; - if (para_fread(fbuf, 1, 3, infile) < 0) - return -E_FREAD; - fbuf[3] = '\0'; - if (strcmp("TAG", fbuf)) { - PARA_INFO_LOG("%s", "no id3 tag\n"); - return 0; - } - if (fseek(infile, -125, SEEK_END) < 0) - return -E_FSEEK; - if (para_fread(mp3.id3.title, 1, 30, infile) != 30) - return -E_FREAD; - mp3.id3.title[30] = '\0'; - if (para_fread(mp3.id3.artist, 1, 30, infile) != 30) - return -E_FREAD; - mp3.id3.artist[30] = '\0'; - if (para_fread(mp3.id3.album, 1, 30, infile) != 30) - return -E_FREAD; - mp3.id3.album[30] = '\0'; - if (para_fread(mp3.id3.year, 1, 4, infile) != 4) - return -E_FREAD; - mp3.id3.year[4] = '\0'; - if (para_fread(mp3.id3.comment, 1, 30, infile) != 30) - return -E_FREAD; - 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); - return 1; -} - -static int find_valid_start(void) +static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos, + struct mp3header *header) { int frame_len; - if (!infile) - return -E_MP3_NO_FILE; - frame_len = get_header(infile, &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(); + frame_len = mp3_seek_next_header(map, numbytes, fpos, header); if (frame_len <= 0) return frame_len; } else - if (fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR) < 0) - return -E_FSEEK; + *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, 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; + char *taginfo; - num_chunks = 0; - inbuf = para_malloc(DEFAULT_INBUF_SIZE); - inbuf_size = DEFAULT_INBUF_SIZE; - chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); - ret = mp3_get_id3(); - if (ret < 0) - goto err_out; - rewind(infile); - mp3.vbr = 0; - mp3.freq = 0; + afhi->chunks_total = 0; + afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t)); + taginfo = mp3_get_id3(map, numbytes, fd); while (1) { - int freq, br, fl; + int freq, br; struct timeval tmp, cct; /* current chunk time */ - if (len > 0) { - ret = -E_FSEEK; - if (fseek(infile, len, SEEK_CUR) < 0) + fpos += len; + 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; - } - len = find_valid_start(); - if (len <= 0) + end = afhi->chunk_table[afhi->chunks_total - 1] + fl; + afhi->chunk_table[afhi->chunks_total] + = PARA_MIN(end, numbytes); 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(&header); + if (ret < 0) continue; + freq = ret; + ret = header_bitrate(&header); + if (ret < 0) + continue; + br = ret; + ret = frame_length(&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 (afhi->chunks_total >= chunk_table_size) { chunk_table_size *= 2; - chunk_table = para_realloc(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); - 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 += (freq - freq_avg) / (num_chunks + 1); - fl_avg += (fl - fl_avg) / (num_chunks + 1); - br_avg += (br - br_avg) / (num_chunks + 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 (!num_chunks || !freq_avg || !br_avg) + if (!freq_sum || !br_sum) goto err_out; - ret = -E_FSEEK; - if (fseek(infile, 0, SEEK_END) < 0) - 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)); + 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)); + tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv); + PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv)); + 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: - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - free(chunk_table); - free(inbuf); + free(taginfo); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + free(afhi->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) +static int mp3_get_file_info(char *map, size_t numbytes, int fd, + struct afh_info *afhi) { 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, fd, afhi); + if (ret < 0) return ret; - } - write_info_str(info_str); - *frames = num_chunks; - *seconds = mp3.seconds; - if (*seconds < 2 || !*frames) + if (afhi->seconds_total < 2 || !afhi->chunks_total) return -E_MP3_INFO; return 1; } -static int mp3_reposition_stream(__a_unused long unsigned new_frame) -{ - return 1; -} - -static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len) -{ - int ret; - size_t pos; - - *len = 0; - if (current_chunk >= num_chunks) - return NULL; - pos = chunk_table[current_chunk]; - *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk]; - if (inbuf_size < *len) { - PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n", - current_chunk, num_chunks, *len); - inbuf = para_realloc(inbuf, *len); - inbuf_size = *len; - } -// PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk, -// pos, *len); - ret = fseek(infile, pos, SEEK_SET); - if (ret < 0) - return NULL; - ret = para_fread(inbuf, *len, 1, infile); - if (ret != *len) - return NULL; -// PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0], -// (long unsigned) inbuf[4]); - return (char *)inbuf; -} - -static void mp3_close_audio_file(void) -{ - if (!infile) - return; - fclose(infile); - infile = NULL; - free(chunk_table); - free(inbuf); -} - 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->reposition_stream = mp3_reposition_stream; - af->read_chunk = mp3_read_chunk; - 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; }