From: Andre Noll Date: Sun, 4 Mar 2007 19:18:34 +0000 (+0100) Subject: unify aac and mp3 audio format handlers X-Git-Tag: v0.2.16~70 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=075a9c88085a4925bcb44857de3d025aa3cdd398 unify aac and mp3 audio format handlers This makes the mp3 audio format handler use a chunk table just like m4a and ogg vorbis already do. Moreover, the aac and mp3 audio format handlers now have identical read_chunk and reposition_stream handlers. Next step is to tweak the ogg vorbis audio format handler so that it also fits into this scheme. In the end, this allows to move read_chunk() and reposition_stream() from the audio format handlers one layer up to the virtual streaming system and to kill the function pointers in struct audio_format. The advantage of this change that it avoids duplicated/similar code, and that new audio format handlers can added easier. --- diff --git a/aac_afh.c b/aac_afh.c index d5ec442b..f29e55bb 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -40,7 +40,6 @@ static unsigned char *inbuf; static size_t inbuf_len; static struct audio_format_handler *af; static size_t num_chunks; -static size_t entry; static size_t *chunk_table; static NeAACDecHandle handle; @@ -51,6 +50,10 @@ static void aac_close_audio_file(void) return; fclose(infile); infile = NULL; + free(inbuf); + inbuf = NULL; + free(chunk_table); + chunk_table = NULL; } static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip) @@ -94,9 +97,8 @@ static int read_chunk_table(size_t skip) } num_chunks = ret; PARA_INFO_LOG("sz table has %zu entries\n", num_chunks); - free(chunk_table); - chunk_table = para_malloc(num_chunks * sizeof(size_t)); - for (i = 0; i < num_chunks; i++) { + chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t)); + for (i = 1; i <= num_chunks; i++) { if (skip + 4 > inbuf_len) { skip = inbuf_len - skip; memmove(inbuf, inbuf + inbuf_len - skip, skip); @@ -136,13 +138,12 @@ static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC) static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, int *seconds) { - int ret, decoder_len; + int i, ret, decoder_len; size_t skip; unsigned long rate = 0; unsigned char channels = 0; mp4AudioSpecificConfig mp4ASC; - free(inbuf); inbuf_size = DEFAULT_INBUF_SIZE; inbuf = para_malloc(inbuf_size); infile = file; @@ -180,7 +181,9 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, return -E_AAC_READ; PARA_INFO_LOG("next buffer: %d bytes\n", ret); } - entry = ret; + chunk_table[0] = ret; + for (i = 1; i<= num_chunks; i++) + chunk_table[i] += ret; sprintf(info_str, "audio_file_info1:%zu x %lums\n" "audio_file_info2:\n" "audio_file_info3:\n", @@ -206,14 +209,11 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len) *len = 0; if (current_chunk >= num_chunks) return NULL; - if (!current_chunk) { - *len = chunk_table[0]; - pos = entry; - } else { - *len = chunk_table[current_chunk] - chunk_table[current_chunk - 1]; - pos = entry + chunk_table[current_chunk - 1]; - } + 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; } @@ -230,6 +230,7 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len) return (char *)inbuf; } + static const char* aac_suffixes[] = {"m4a", "mp4", NULL}; /** the init function of the aac audio format handler */ void aac_afh_init(struct audio_format_handler *p) diff --git a/mp3_afh.c b/mp3_afh.c index a63e2e86..ca487efc 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -34,6 +34,7 @@ #include "afh.h" #include "error.h" #include "fd.h" +#include "string.h" /** \cond some defines and structs which are only used in this file */ @@ -41,10 +42,11 @@ * 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 */ -#define MIN_CONSEC_GOOD_FRAMES 3 +#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; @@ -70,14 +72,12 @@ struct id3tag { struct mp3info { char *filename; - FILE *file; struct mp3header header; int id3_isvalid; struct id3tag id3; int vbr; long unsigned br_average; long unsigned seconds; - int frames; int freq; }; @@ -105,10 +105,12 @@ static int mp3info_bitrate[2][3][14] = { static 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 mp3buf[8192]; -static int chunk_size; +static char *inbuf; +static size_t inbuf_size; static struct audio_format_handler *af; +static ssize_t *chunk_table, num_chunks; static int header_frequency(struct mp3header *h) { @@ -154,7 +156,7 @@ static void write_info_str(char *info_str) "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", - mp3.frames, + num_chunks, tv2ms(&af->chunk_tv), mp3.br_average, mp3.vbr? 'v' : 'c', @@ -255,26 +257,26 @@ static int mp3_seek_next_header(void) long valid_start = 0; while (1) { - while ((c = fgetc(mp3.file)) != 255 && (c != EOF)) + while ((c = fgetc(infile)) != 255 && (c != EOF)) ; /* nothing */ if (c != 255) return 0; - ungetc(c, mp3.file); - valid_start = ftell(mp3.file); - first_len = get_header(mp3.file, &h); + ungetc(c, infile); + valid_start = ftell(infile); + first_len = get_header(infile, &h); if (first_len <= 0) continue; - if (fseek(mp3.file, first_len - FRAME_HEADER_SIZE, SEEK_CUR) < 0) + if (fseek(infile, first_len - FRAME_HEADER_SIZE, SEEK_CUR) < 0) return -E_FSEEK; for (k = 1; k < MIN_CONSEC_GOOD_FRAMES; k++) { - if ((l = get_header(mp3.file, &h2)) <= 0) + if ((l = get_header(infile, &h2)) <= 0) break; if (!compare_headers(&h, &h2)) break; - fseek(mp3.file, l - FRAME_HEADER_SIZE, SEEK_CUR); + fseek(infile, l - FRAME_HEADER_SIZE, SEEK_CUR); } if (k == MIN_CONSEC_GOOD_FRAMES) { - fseek(mp3.file, valid_start, SEEK_SET); + fseek(infile, valid_start, SEEK_SET); memcpy(&(mp3.header), &h2, sizeof(struct mp3header)); return first_len; } @@ -291,30 +293,30 @@ static int mp3_get_id3(void) mp3.id3.album[0] = '\0'; mp3.id3.comment[0] = '\0'; mp3.id3.year[0] = '\0'; - if (fseek(mp3.file, -128, SEEK_END)) + if (fseek(infile, -128, SEEK_END)) return -E_FSEEK; - if (para_fread(fbuf, 1, 3, mp3.file) < 0) + 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(mp3.file, -125, SEEK_END) < 0) + if (fseek(infile, -125, SEEK_END) < 0) return -E_FSEEK; - if (para_fread(mp3.id3.title, 1, 30, mp3.file) != 30) + 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, mp3.file) != 30) + 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, mp3.file) != 30) + 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, mp3.file) != 4) + 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, mp3.file) != 30) + if (para_fread(mp3.id3.comment, 1, 30, infile) != 30) return -E_FREAD; mp3.id3.comment[30] = '\0'; mp3.id3_isvalid = 1; @@ -330,9 +332,9 @@ static int find_valid_start(void) { int frame_len; - if (!mp3.file) + if (!infile) return -E_MP3_NO_FILE; - frame_len = get_header(mp3.file, &mp3.header); + frame_len = get_header(infile, &mp3.header); if (frame_len < 0) return frame_len; if (!frame_len) { @@ -340,31 +342,38 @@ static int find_valid_start(void) if (frame_len <= 0) return frame_len; } else - if (fseek(mp3.file, -FRAME_HEADER_SIZE, SEEK_CUR) < 0) + if (fseek(infile, -FRAME_HEADER_SIZE, SEEK_CUR) < 0) return -E_FSEEK; - if (frame_len <= 1) /* FRAME_HEADER_SIZE? */ + if (frame_len <= 1) return -E_FRAME_LENGTH; return frame_len; } static int mp3_read_info(void) { - long fl_avg = 0, freq_avg = 0, br_avg = 0, fcount = 0; + 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 */ + 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) - return ret; - rewind(mp3.file); + goto err_out; + rewind(infile); mp3.vbr = 0; mp3.freq = 0; while (1) { int freq, br, fl; struct timeval tmp, cct; /* current chunk time */ - if (len > 0) - if (fseek(mp3.file, len, SEEK_CUR) < 0) - return -E_FSEEK; + if (len > 0) { + ret = -E_FSEEK; + if (fseek(infile, len, SEEK_CUR) < 0) + goto err_out; + } len = find_valid_start(); if (len <= 0) break; @@ -378,34 +387,54 @@ static int mp3_read_info(void) 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); - fcount++; - if (fcount == 1) { + //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) { + 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; } - freq_avg += (freq - freq_avg) / (fcount + 1); - fl_avg += (fl - fl_avg) / (fcount + 1); - br_avg += (br - br_avg) / (fcount + 1); + 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; old_br = br; } - if (!fcount || !freq_avg || !br_avg) - return -E_MP3_INFO; + ret = -E_MP3_INFO; + if (!num_chunks || !freq_avg || !br_avg) + 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.frames = fcount; mp3.seconds = (tv2ms(&total_time) + 500) / 1000; - tv_divide(fcount, &total_time, &af->chunk_tv); - rewind(mp3.file); - PARA_DEBUG_LOG("chunk_time: %lums\n", tv2ms(&af->chunk_tv)); + 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)); return 1; +err_out: + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + free(chunk_table); + free(inbuf); + return ret; } /* @@ -418,68 +447,62 @@ static int mp3_get_file_info(FILE *audio_file, char *info_str, if (!audio_file) return -E_MP3_NO_FILE; - mp3.file = audio_file; + infile = audio_file; ret = mp3_read_info(); if (ret < 0) { - mp3.file = NULL; + infile = NULL; return ret; } write_info_str(info_str); - *frames = mp3.frames; + *frames = num_chunks; *seconds = mp3.seconds; if (*seconds < 2 || !*frames) return -E_MP3_INFO; return 1; } -static int mp3_reposition_stream(long unsigned new_frame) +static int mp3_reposition_stream(__a_unused long unsigned new_frame) { - int count = 0, len; - - PARA_DEBUG_LOG("jmp to frame %lu/%i\n", new_frame, mp3.frames); - rewind(mp3.file); - while (count < new_frame && (len = find_valid_start()) > 0) { -// PARA_DEBUG_LOG("%s: jmp to frame %d\n", __func__, count); - if (fseek(mp3.file, len, SEEK_CUR) < 0) - return -E_FSEEK; - count++; - } - if (count != new_frame) { - rewind(mp3.file); - return -E_MP3_REPOS; - } return 1; } -static int mp3_read_next_chunk(void) +static char *mp3_read_chunk(long unsigned current_chunk, ssize_t *len) { - int len = find_valid_start(); + int ret; + size_t pos; - if (len <= 0) { - if (len < 0) - PARA_ERROR_LOG("invalid frame len (%d)\n", len); - return len; + *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; } - chunk_size = para_fread(mp3buf, len, 1, mp3.file); - if (len != chunk_size) - PARA_DEBUG_LOG("short read (%d/%d)\n", chunk_size, len); - return chunk_size; -} - -static char *mp3_read_chunk(__a_unused long unsigned chunk_num, ssize_t *len) -{ - *len = mp3_read_next_chunk(); - if (*len <= 0) +// 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; - return mp3buf; +// 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 (!mp3.file) + if (!infile) return; - fclose(mp3.file); - mp3.file = NULL; + fclose(infile); + infile = NULL; + free(chunk_table); + free(inbuf); } static const char* mp3_suffixes[] = {"mp3", NULL};