From 019f1ffdacd228f6a1e701ef6795c1a65ff02785 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 13 May 2006 04:38:26 +0200 Subject: [PATCH] First version of the aac audio format handler that kinda works. ATM, only 2 channels, 44100Hz is supported. Still needs more work. This also fixes two bugs in the error path of aacdec, where positive values are returned due to a missing "-". --- aac.h | 3 ++ aac_afh.c | 147 +++++++++++++++++++++++++++++++++++++++++++-------- aac_common.c | 29 +++++++++- aacdec.c | 23 +++++--- 4 files changed, 172 insertions(+), 30 deletions(-) diff --git a/aac.h b/aac.h index 8ae7502e..d1c0e3ac 100644 --- a/aac.h +++ b/aac.h @@ -3,3 +3,6 @@ /* exported symbols from aac_common.c */ NeAACDecHandle aac_open(void); int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip); +int aac_find_stco(unsigned char *buf, unsigned buflen, int *skip); +int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip); +unsigned aac_read_int32(unsigned char *buf); diff --git a/aac_afh.c b/aac_afh.c index 436005e0..9cab3920 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -31,16 +31,59 @@ static FILE *infile; static int inbuf_size; static unsigned char *inbuf; -static ssize_t *chunk_table; +static unsigned inbuf_len; struct audio_format *af; -unsigned num_chunks, chunk_num; +static unsigned num_chunks, entry; +static size_t *chunk_table; NeAACDecHandle handle; + + static void aac_close_audio_file(void) { } +static int read_stsz(unsigned skip) +{ + int ret, i; + long unsigned sum = 0; + + for (;;) { + ret = aac_find_stsz(inbuf, inbuf_len, &skip); + if (ret >= 0) + break; + ret = read(fileno(infile), inbuf, inbuf_size); + if (ret <= 0) + return -E_AAC_READ; + PARA_INFO_LOG("next buffer: %d bytes\n", ret); + } + num_chunks = ret; + PARA_INFO_LOG("sz table has %d entries\n", num_chunks); + free(chunk_table); + chunk_table = para_malloc(num_chunks * sizeof(size_t)); + for (i = 0; i < num_chunks; i++) { + if (skip + 4 > inbuf_len) { + skip = inbuf_len - skip; + memmove(inbuf, inbuf + inbuf_len - skip, skip); + ret = read(fileno(infile), inbuf + skip, inbuf_size - skip); + if (ret <= 0) + return -E_AAC_READ; + inbuf_len = ret + skip; + skip = 0; + PARA_INFO_LOG("next buffer: %d bytes\n", inbuf_len); + } + sum += aac_read_int32(inbuf + skip); + chunk_table[i] = sum; + skip += 4; + if (i < 10 || i > num_chunks - 10) + PARA_DEBUG_LOG("offset #%d: %d\n", i, chunk_table[i]); + } + return 1; + +} + + /* * Init m4a file and write some tech data to given pointers. */ @@ -48,9 +91,9 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, int *seconds) { int ret, skip, decoder_len; - unsigned inbuf_len; unsigned long rate = 0; unsigned char channels = 0; + mp4AudioSpecificConfig mp4ASC; free(inbuf); inbuf_size = DEFAULT_INBUF_SIZE; @@ -70,9 +113,49 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, decoder_len = ret; handle = aac_open(); ret = NeAACDecInit(handle, inbuf + skip, - inbuf_len - skip, &rate, &channels); + decoder_len, &rate, &channels); + if (ret < 0) + return -E_AACDEC_INIT; + skip += ret; PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels); - + ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip, &mp4ASC); + if (ret >= 0) { + PARA_DEBUG_LOG("mp4ASC.samplingFrequency: %lu\n", + mp4ASC.samplingFrequency); + } else + PARA_WARNING_LOG("no mp4ASC %s\n", ""); + + ret = read_stsz(skip); + if (ret < 0) + return ret; + for (;;) { + ret = aac_find_stco(inbuf, inbuf_len, &skip); + if (ret >= 0) + break; + ret = read(fileno(infile), inbuf, inbuf_size); + if (ret <= 0) + return -E_AAC_READ; + PARA_INFO_LOG("next buffer: %d bytes\n", ret); + } + *frames = ret; + entry = aac_read_int32(inbuf + skip); + PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks, + entry); +#if 1 + sprintf(info_str, "audio_file_info1:%d x %lums\n" + "audio_file_info2:\n" + "audio_file_info3:\n", + num_chunks, + tv2ms(&af->chunk_tv)); +#endif +#if 1 + { + struct timeval total_tv; + tv_scale(num_chunks, &af->chunk_tv, &total_tv); + *seconds = tv2ms(&total_tv) / 1000; + PARA_INFO_LOG("%d seconds, %d chunks\n", *seconds, num_chunks); + } +#endif return 1; } @@ -84,26 +167,48 @@ static int aac_reposition_stream(long unsigned request) return -E_AAC_REPOS; } -static int get_chunk_size(long unsigned chunk_num) +static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream) { - int ret; - if (chunk_num >= num_chunks) - return -1; - ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num]; - if (!ret) - return ret; -#if 0 - PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n", - chunk_num, - chunk_table[chunk_num], - chunk_table[chunk_num + 1] - 1, - ret); -#endif - return ret; + size_t res = fread(ptr, size, nmemb, stream); + if (res == nmemb) + return size * nmemb; + if (feof(stream)) + return 0; + return -E_FREAD; } char *aac_read_chunk(long unsigned current_chunk, ssize_t *len) { + int ret; + size_t pos; + + *len = 0; + if (current_chunk >= num_chunks) + return NULL; + if (!current_chunk) { + *len = entry; + pos = 0; + } else if (current_chunk == 1) { + *len = chunk_table[0]; + pos = entry; + } else { + *len = chunk_table[current_chunk - 1] - chunk_table[current_chunk - 2]; + pos = entry + chunk_table[current_chunk - 2]; + } + if (inbuf_size < *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; } @@ -116,6 +221,6 @@ void aac_afh_init(void *p) af->close_audio_file = aac_close_audio_file; af->get_header_info = NULL; af->chunk_tv.tv_sec = 0; - af->chunk_tv.tv_usec = 250 * 1000; + af->chunk_tv.tv_usec = 23120; tv_scale(3, &af->chunk_tv, &af->eof_tv); } diff --git a/aac_common.c b/aac_common.c index 16109b95..3739be9d 100644 --- a/aac_common.c +++ b/aac_common.c @@ -57,6 +57,7 @@ int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip) if (*p != 5) continue; i++; + p = buf + i; decoder_length = aac_read_decoder_length(p, &description_len); PARA_INFO_LOG("decoder length: %d\n", decoder_length); i += description_len; @@ -73,7 +74,7 @@ unsigned aac_read_int32(unsigned char *buf) } -int find_stco(unsigned char *buf, unsigned buflen, int *skip) +int aac_find_stco(unsigned char *buf, unsigned buflen, int *skip) { int i, ret; @@ -90,6 +91,32 @@ int find_stco(unsigned char *buf, unsigned buflen, int *skip) *skip = i; return ret; } + PARA_WARNING_LOG("stco not found, buflen: %d\n", buflen); + return -E_STCO; +} + +int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip) +{ + int i, ret; + + for (i = 0; i + 16 < buflen; i++) { + unsigned char *p = buf + i; + unsigned sample_count, sample_size; + + if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z') + continue; + PARA_INFO_LOG("found stsz@%d\n", i); + i += 8; + sample_size = aac_read_int32(buf + i); + PARA_INFO_LOG("sample size: %d\n", sample_size); + i += 4; + sample_count = aac_read_int32(buf + i); + i += 4; + PARA_INFO_LOG("sample count: %d\n", sample_count); + *skip = i; + return sample_count; + } + PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen); return -E_STCO; } diff --git a/aacdec.c b/aacdec.c index 7ea7856f..c41a5ac8 100644 --- a/aacdec.c +++ b/aacdec.c @@ -106,7 +106,7 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn) struct filter_chain_info *fci = fn->fci; unsigned long rate = 0; unsigned char channels = 0; - int i, ret, nbytes; + int i, ret, nbytes, skip; unsigned char *p, *outbuffer; if (fn->loaded > fn->bufsize * 4 / 5) @@ -118,21 +118,22 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn) padd->inbuf_len = len; if (!padd->initialized) { - int skip; padd->decoder_length = aac_find_esds(padd->inbuf, padd->inbuf_len, &skip); + PARA_INFO_LOG("decoder len: %d\n", padd->decoder_length); if (padd->decoder_length < 0) { ret = NeAACDecInit(padd->decoder, padd->inbuf, padd->inbuf_len, &rate, &channels); + PARA_INFO_LOG("decoder init: %d\n", ret); if (ret < 0) { - ret = E_AACDEC_INIT; + ret = -E_AACDEC_INIT; goto out; } padd->consumed = ret; } else { padd->consumed += skip; p = padd->inbuf + padd->consumed; - ret = E_AACDEC_INIT; + ret = -E_AACDEC_INIT; if (NeAACDecInit2(padd->decoder, p, padd->decoder_length, &rate, &channels) < 0) @@ -140,16 +141,22 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn) } fci->samplerate = rate; fci->channels = channels; - PARA_INFO_LOG("rate: %u, channels: %d\n", fci->samplerate, - fci->channels); + PARA_INFO_LOG("rate: %u, channels: %d\n", + fci->samplerate, fci->channels); padd->initialized = 1; } if (padd->decoder_length > 0) { padd->consumed = 0; if (!padd->offset_pos) { - ret = len; - if (find_stco(padd) < 0) + ret = aac_find_stco(padd->inbuf + padd->consumed, + padd->inbuf_len - padd->consumed, &skip); + if (ret < 0) { + ret = len; goto out; + } + padd->noffsets = ret; + padd->offset = para_malloc(padd->noffsets * sizeof(int)); + padd->consumed += skip; } if (padd->offset_pos < padd->noffsets) { fill_offset_table(padd); -- 2.39.5