Make aac work with any bitrate.

By replacing the hardcoded 23ms timeout by a timeout
computed from the audio spec config.

diff --git a/aac_afh.c b/aac_afh.c
index a8d162e4b7de7a895969c53ada0fb67a9c08367e..601621ed8c99ff22b72b89af3c11f810dd58936c 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -109,13 +109,27 @@ static int read_chunk_table(size_t skip)
                sum += aac_read_int32(inbuf + skip);
                chunk_table[i] = sum;
                skip += 4;
-               if (i < 10 || i > num_chunks - 10)
+               if (i < 10 || i + 10 > num_chunks)
                        PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
        }
        return 1;
 
 }
 
+long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+{
+       float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
+               ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
+       struct timeval total;
+
+       ms2tv(ms, &total);
+       tv_divide(num_chunks, &total, &af->chunk_tv);
+       PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+               mp4ASC->samplingFrequency, ms / 1000,
+               num_chunks, tv2ms(&af->chunk_tv));
+       return ms / 1000;
+}
+
 /*
  * Init m4a file and write some tech data to given pointers.
  */
@@ -133,12 +147,9 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        inbuf = para_malloc(inbuf_size);
        infile = file;
 
-       PARA_INFO_LOG("file: %p\n", file);
        ret = read(fileno(infile), inbuf, inbuf_size);
-       PARA_INFO_LOG("read %d bytes\n", ret);
        if (ret <= 0)
                return -E_AAC_READ;
-       PARA_INFO_LOG("checking aac %d bytes\n", ret);
        inbuf_len = ret;
        ret = aac_find_esds(inbuf, inbuf_len, &skip);
        if (ret < 0)
@@ -151,17 +162,15 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                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 = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
+               &mp4ASC);
+       if (ret < 0)
+               return -E_MP4ASC;
        ret = read_chunk_table(skip);
        if (ret < 0)
                return ret;
        *frames = num_chunks;
+       *seconds = aac_set_chunk_tv(&mp4ASC);
        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
@@ -172,23 +181,11 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
        entry = ret;
-       PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
-               entry);
-#if 1
        sprintf(info_str, "audio_file_info1:%zu 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, %zu chunks\n", *seconds, num_chunks);
-       }
-#endif
        return 1;
 }
 
@@ -243,8 +240,6 @@ void aac_afh_init(struct audio_format_handler *p)
        af->read_chunk = aac_read_chunk;
        af->close_audio_file = aac_close_audio_file;
        af->get_header_info = NULL;
-       af->chunk_tv.tv_sec = 0;
-       af->chunk_tv.tv_usec = 23120;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);
        af->suffixes = aac_suffixes;
 }

diff --git a/aac_common.c b/aac_common.c
index 7ccc668f55127727ec0161477bc3f2e2c7a6e980..2dc979011be245850cef106167bd4fad611abe1e 100644 (file)
--- a/aac_common.c
+++ b/aac_common.c
@@ -130,7 +130,7 @@ ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip)
                i += 12;
                ret = aac_read_int32(buf + i); /* first offset */
                i += 4;
-               PARA_INFO_LOG("num entries: %zd\n", ret);
+               PARA_INFO_LOG("entry point: %zd\n", ret);
                *skip = i;
                return ret;
        }

diff --git a/error.h b/error.h
index b70f7b477094478b6b20267e582a459b386c040f..dabe82bff71380dca0fcb79d9c724f8b1b5ed3a6 100644 (file)
--- a/error.h
+++ b/error.h
@@ -194,6 +194,7 @@ extern const char **para_errlist[];
        PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
        PARA_ERROR(AAC_READ, "aac read error"), \
        PARA_ERROR(STSZ, "did not find stcz atom"), \
+       PARA_ERROR(MP4ASC, "audio spec config error"), \
 
 
 #define AAC_COMMON_ERRORS \