struct audio_format_handler: use proper pointer type for the init function

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 92b70915621ce3fd4472d9595adb5b9fe5485636..a8d162e4b7de7a895969c53ada0fb67a9c08367e 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -28,6 +28,7 @@
 #include "error.h"
 #include "string.h"
 #include "aac.h"
+#include "fd.h"
 
 /* must be big enough to hold header */
 #define DEFAULT_INBUF_SIZE 65536
@@ -35,20 +36,23 @@
 static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
-static unsigned inbuf_len;
-struct audio_format *af;
-
-static unsigned num_chunks, entry;
+static size_t inbuf_len;
+struct audio_format_handler *af;
+static size_t num_chunks;
+static size_t entry;
 
 static size_t *chunk_table;
 NeAACDecHandle handle;
 
-
 static void aac_close_audio_file(void)
 {
+       if (!infile)
+               return;
+       fclose(infile);
+       infile = NULL;
 }
 
-static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
+static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 {
        int i;
 
@@ -73,10 +77,10 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
        return -E_STSZ;
 }
 
-static int read_chunk_table(unsigned skip)
+static int read_chunk_table(size_t skip)
 {
        int ret, i;
-       long unsigned sum = 0;
+       size_t sum = 0;
 
        for (;;) {
                ret = aac_find_stsz(inbuf, inbuf_len, &skip);
@@ -88,7 +92,7 @@ static int read_chunk_table(unsigned skip)
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
        num_chunks = ret;
-       PARA_INFO_LOG("sz table has %d entries\n", num_chunks);
+       PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
        free(chunk_table);
        chunk_table = para_malloc(num_chunks * sizeof(size_t));
        for (i = 0; i < num_chunks; i++) {
@@ -100,13 +104,13 @@ static int read_chunk_table(unsigned skip)
                                return -E_AAC_READ;
                        inbuf_len = ret + skip;
                        skip = 0;
-                       PARA_INFO_LOG("next buffer: %d bytes\n", inbuf_len);
+                       PARA_INFO_LOG("next buffer: %zu 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]);
+                       PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
        }
        return 1;
 
@@ -118,7 +122,8 @@ static int read_chunk_table(unsigned skip)
 static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        int *seconds)
 {
-       int ret, skip, decoder_len;
+       int ret, decoder_len;
+       size_t skip;
        unsigned long rate = 0;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
@@ -167,10 +172,10 @@ 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 %d entries\, entry: %zd\n", num_chunks,
+       PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
                entry);
 #if 1
-       sprintf(info_str, "audio_file_info1:%d x %lums\n"
+       sprintf(info_str, "audio_file_info1:%zu x %lums\n"
                "audio_file_info2:\n"
                "audio_file_info3:\n",
                num_chunks,
@@ -181,7 +186,7 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        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);
+       PARA_INFO_LOG("%d seconds, %zu chunks\n", *seconds, num_chunks);
        }
 #endif
        return 1;
@@ -196,16 +201,6 @@ static int aac_reposition_stream(long unsigned request)
 //     return -E_AAC_REPOS;
 }
 
-static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-       size_t res = fread(ptr, size, nmemb, stream);
-       if (res == nmemb)
-               return size * nmemb;
-       if (feof(stream))
-               return 0;
-       return -E_FREAD;
-}
-
 static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 {
        int ret;
@@ -238,7 +233,9 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        return (char *)inbuf;
 }
 
-void aac_afh_init(void *p)
+static const char* aac_suffixes[] = {"m4a", NULL};
+/** the init function of the aac audio format handler */
+void aac_afh_init(struct audio_format_handler *p)
 {
        af = p;
        af->reposition_stream = aac_reposition_stream;
@@ -249,4 +246,5 @@ void aac_afh_init(void *p)
        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;
 }