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 cd374c818709e6a520910b7c58cc55df5071a2e9..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
 
-static struct audio_format_handler *af;
 static FILE *infile;
-static unsigned char *inbuf;
-static size_t inbuf_len;
 
 static void aac_close_audio_file(void)
 {
@@ -44,8 +41,6 @@ static void aac_close_audio_file(void)
                return;
        fclose(infile);
        infile = NULL;
-       free(inbuf);
-       inbuf = NULL;
 }
 
 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;
 }
 
-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;
@@ -85,6 +81,7 @@ 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;
+               inbuf_len = ret;
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
        afi->chunks_total = ret;
@@ -94,7 +91,8 @@ static int read_chunk_table(struct audio_format_info *afi, size_t 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;
@@ -131,45 +129,49 @@ 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;
-       size_t skip;
+       size_t inbuf_len, skip;
        unsigned long rate = 0;
-       unsigned char channels = 0;
+       unsigned char channels = 0, *inbuf = para_malloc(AAC_INBUF_SIZE);
        mp4AudioSpecificConfig mp4ASC;
        NeAACDecHandle handle;
 
-       inbuf = para_malloc(AAC_INBUF_SIZE);
        infile = file;
-
        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)
-               return ret;
+               goto out;
        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);
-       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)
-               return ret;
+               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);
-               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;
@@ -181,15 +183,17 @@ static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
                afi->chunks_total,
                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)
 {
-       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;
 }