aac_afh.c: kill global variables inbuf and inbuf_len

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 1633c00fe9a084a2f4f7090da30208b1948ffccb..ab97cdad0da50177b0820651dfd69f7237a7cd27 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -33,10 +33,7 @@
 /** size of the input buffer, must be big enough to hold header */
 #define AAC_INBUF_SIZE 65536
 
 /** size of the input buffer, must be big enough to hold header */
 #define AAC_INBUF_SIZE 65536
 

-static struct audio_format_handler *af;

 static FILE *infile;
 static FILE *infile;

-static unsigned char *inbuf;
-static size_t inbuf_len, num_chunks;

 
 static void aac_close_audio_file(void)
 {
 
 static void aac_close_audio_file(void)
 {


@@ -44,8 +41,6 @@ static void aac_close_audio_file(void)
                return;
        fclose(infile);
        infile = NULL;
                return;
        fclose(infile);
        infile = NULL;

-       free(inbuf);
-       inbuf = NULL;

 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)


@@ -73,7 +68,8 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
        return -E_STSZ;
 }
 
        return -E_STSZ;
 }
 

-static int read_chunk_table(struct audio_format_info *afi, size_t skip)
+static int read_chunk_table(struct audio_format_info *afi, unsigned char *inbuf,
+               size_t inbuf_len, size_t skip)

 {
        int ret, i;
        size_t sum = 0;
 {
        int ret, i;
        size_t sum = 0;


@@ -85,16 +81,18 @@ static int read_chunk_table(struct audio_format_info *afi, size_t skip)
                ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
                if (ret <= 0)
                        return -E_AAC_READ;
                ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
                if (ret <= 0)
                        return -E_AAC_READ;

+               inbuf_len = ret;

                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }

-       num_chunks = ret;
-       PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
-       afi->chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
-       for (i = 1; i <= num_chunks; i++) {
+       afi->chunks_total = ret;
+       PARA_INFO_LOG("sz table has %lu entries\n", afi->chunks_total);
+       afi->chunk_table = para_malloc((afi->chunks_total + 1) * sizeof(size_t));
+       for (i = 1; i <= afi->chunks_total; i++) {

                if (skip + 4 > inbuf_len) {
                        skip = inbuf_len - skip;
                        memmove(inbuf, inbuf + inbuf_len - skip, skip);
                if (skip + 4 > inbuf_len) {
                        skip = inbuf_len - skip;
                        memmove(inbuf, inbuf + inbuf_len - skip, skip);

-                       ret = read(fileno(infile), inbuf + skip, AAC_INBUF_SIZE - skip);
+                       ret = read(fileno(infile), inbuf + skip,
+                               AAC_INBUF_SIZE - skip);

                        if (ret <= 0)
                                return -E_AAC_READ;
                        inbuf_len = ret + skip;
                        if (ret <= 0)
                                return -E_AAC_READ;
                        inbuf_len = ret + skip;


@@ -104,7 +102,7 @@ static int read_chunk_table(struct audio_format_info *afi, size_t skip)
                sum += aac_read_int32(inbuf + skip);
                afi->chunk_table[i] = sum;
                skip += 4;
                sum += aac_read_int32(inbuf + skip);
                afi->chunk_table[i] = sum;
                skip += 4;

-               if (i < 10 || i + 10 > num_chunks)
+               if (i < 10 || i + 10 > afi->chunks_total)

                        PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
        }
        return 1;
                        PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
        }
        return 1;


@@ -114,14 +112,14 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
                mp4AudioSpecificConfig *mp4ASC)
 {
        float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
                mp4AudioSpecificConfig *mp4ASC)
 {
        float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,

-               ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
+               ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;

        struct timeval total;
 
        ms2tv(ms, &total);
        struct timeval total;
 
        ms2tv(ms, &total);

-       tv_divide(num_chunks, &total, &afi->chunk_tv);
-       PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+       tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+       PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",

                mp4ASC->samplingFrequency, ms / 1000,
                mp4ASC->samplingFrequency, ms / 1000,

-               num_chunks, tv2ms(&afi->chunk_tv));
+               afi->chunks_total, tv2ms(&afi->chunk_tv));

        return ms / 1000;
 }
 
        return ms / 1000;
 }
 


@@ -131,66 +129,71 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
 static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
        int i, ret, decoder_len;
 static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
        int i, ret, decoder_len;

-       size_t skip;
+       size_t inbuf_len, skip;

        unsigned long rate = 0;
        unsigned long rate = 0;

-       unsigned char channels = 0;
+       unsigned char channels = 0, *inbuf = para_malloc(AAC_INBUF_SIZE);

        mp4AudioSpecificConfig mp4ASC;
        NeAACDecHandle handle;
 
        mp4AudioSpecificConfig mp4ASC;
        NeAACDecHandle handle;
 

-       inbuf = para_malloc(AAC_INBUF_SIZE);

        infile = file;
        infile = file;

-

        ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
        ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);

-       if (ret <= 0)
-               return -E_AAC_READ;
+       if (ret <= 0) {
+               ret = -E_AAC_READ;
+               goto out;
+       }

        inbuf_len = ret;
        ret = aac_find_esds(inbuf, inbuf_len, &skip);
        if (ret < 0)
        inbuf_len = ret;
        ret = aac_find_esds(inbuf, inbuf_len, &skip);
        if (ret < 0)

-               return ret;
+               goto out;

        decoder_len = ret;
        handle = aac_open();
        decoder_len = ret;
        handle = aac_open();

-       ret = NeAACDecInit(handle, inbuf + skip,
-               decoder_len, &rate, &channels);
-       if (ret < 0)
-               return -E_AACDEC_INIT;
+       ret = NeAACDecInit(handle, inbuf + skip, decoder_len, &rate, &channels);
+       if (ret < 0) {
+               ret = -E_AACDEC_INIT;
+               goto out;
+       }

        skip += ret;
        PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
        skip += ret;
        PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);

-       ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
-               &mp4ASC);
-       if (ret < 0)
-               return -E_MP4ASC;
-       ret = read_chunk_table(afi, skip);
+       ret = -E_MP4ASC;
+       if (NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
+                       &mp4ASC) < 0)
+               goto out;
+       ret = read_chunk_table(afi, inbuf, inbuf_len, skip);

        if (ret < 0)
        if (ret < 0)

-               return ret;
-       afi->chunks_total = num_chunks;
+               goto out;

        afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
                ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
        afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
                ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);

-               if (ret <= 0)
-                       return -E_AAC_READ;
+               if (ret <= 0) {
+                       ret = -E_AAC_READ;
+                       goto out;
+               }
+               inbuf_len = ret;

                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
        afi->chunk_table[0] = ret;
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
        afi->chunk_table[0] = ret;

-       for (i = 1; i<= num_chunks; i++)
+       for (i = 1; i<= afi->chunks_total; i++)

                afi->chunk_table[i] += ret;
                afi->chunk_table[i] += ret;

-       sprintf(afi->info_string, "audio_file_info1:%zu x %lums\n"
+       sprintf(afi->info_string, "audio_file_info1:%lu x %lums\n"

                "audio_file_info2:\n"
                "audio_file_info3:\n",
                "audio_file_info2:\n"
                "audio_file_info3:\n",

-               num_chunks,
+               afi->chunks_total,

                tv2ms(&afi->chunk_tv));
        tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
                tv2ms(&afi->chunk_tv));
        tv_scale(20, &afi->chunk_tv, &afi->eof_tv);

-       return 1;
+       ret = 1;
+out:
+       free(inbuf);
+       return ret;

 }
 
 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)
 {
 }
 
 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)
 {

-       af = p;
-       af->get_file_info = aac_get_file_info,
-       af->close_audio_file = aac_close_audio_file;
-       af->suffixes = aac_suffixes;
+       p->get_file_info = aac_get_file_info,
+       p->close_audio_file = aac_close_audio_file;
+       p->suffixes = aac_suffixes;

 }
 }