first draft of the mmap patch series

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 8d1ff6847afb06c724e5a96a728f308826cbffc7..f6b869810889cdd47680daaf8c5ef920e810203f 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -33,18 +33,6 @@
 /** size of the input buffer, must be big enough to hold header */
 #define AAC_INBUF_SIZE 65536
 
-static FILE *infile;
-static unsigned char *inbuf;
-static size_t inbuf_len;
-
-static void aac_close_audio_file(void)
-{
-       if (!infile)
-               return;
-       fclose(infile);
-       infile = NULL;
-}
-
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 {
        int i;
@@ -70,7 +58,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(FILE *file, struct audio_format_info *afi,
+               unsigned char *inbuf, size_t inbuf_len, size_t skip)
 {
        int ret, i;
        size_t sum = 0;
@@ -79,7 +68,7 @@ static int read_chunk_table(struct audio_format_info *afi, size_t skip)
                ret = aac_find_stsz(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
-               ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
+               ret = read(fileno(file), inbuf, AAC_INBUF_SIZE);
                if (ret <= 0)
                        return -E_AAC_READ;
                inbuf_len = ret;
@@ -92,7 +81,7 @@ 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,
+                       ret = read(fileno(file), inbuf + skip,
                                AAC_INBUF_SIZE - skip);
                        if (ret <= 0)
                                return -E_AAC_READ;
@@ -103,8 +92,8 @@ 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;
-               if (i < 10 || i + 10 > afi->chunks_total)
-                       PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
+//             if (i < 10 || i + 10 > afi->chunks_total)
+//                     PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
        }
        return 1;
 }
@@ -127,19 +116,17 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
 /*
  * Init m4a file and write some tech data to given pointers.
  */
-static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
+static int aac_get_file_info(FILE *file, char *map, off_t numbytes,
+               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);
+       ret = read(fileno(file), inbuf, AAC_INBUF_SIZE);
        if (ret <= 0) {
                ret = -E_AAC_READ;
                goto out;
@@ -161,7 +148,7 @@ static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
        if (NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
                        &mp4ASC) < 0)
                goto out;
-       ret = read_chunk_table(afi, skip);
+       ret = read_chunk_table(file, afi, inbuf, inbuf_len, skip);
        if (ret < 0)
                goto out;
        afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
@@ -169,7 +156,7 @@ static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
-               ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
+               ret = read(fileno(file), inbuf, AAC_INBUF_SIZE);
                if (ret <= 0) {
                        ret = -E_AAC_READ;
                        goto out;
@@ -193,10 +180,13 @@ out:
 }
 
 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)
+/**
+ * the init function of the aac audio format handler
+ *
+ * \param afh pointer to the struct to initialize
+ */
+void aac_afh_init(struct audio_format_handler *afh)
 {
-       p->get_file_info = aac_get_file_info,
-       p->close_audio_file = aac_close_audio_file;
-       p->suffixes = aac_suffixes;
+       afh->get_file_info = aac_get_file_info,
+       afh->suffixes = aac_suffixes;
 }