aac_afh.c: kill global variables inbuf and inbuf_len
[paraslash.git] / aac_afh.c
index ac73fb1..ab97cda 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
 
 #include "server.cmdline.h"
 #include "server.h"
 
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
+#include "fd.h"
 
 
-/* must be big enough to hold header */
-#define DEFAULT_INBUF_SIZE 65536
+/** size of the input buffer, must be big enough to hold header */
+#define AAC_INBUF_SIZE 65536
 
 static FILE *infile;
 
 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 *chunk_table;
-NeAACDecHandle handle;
-
 
 static void aac_close_audio_file(void)
 {
 
 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;
 
 {
        int i;
 
@@ -70,185 +65,135 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
                return sample_count;
        }
        PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
                return sample_count;
        }
        PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
-       return -E_STCO;
+       return -E_STSZ;
 }
 
 }
 
-static int read_chunk_table(unsigned skip)
+static int read_chunk_table(struct audio_format_info *afi, unsigned char *inbuf,
+               size_t inbuf_len, size_t skip)
 {
        int ret, i;
 {
        int ret, i;
-       long unsigned sum = 0;
+       size_t sum = 0;
 
        for (;;) {
                ret = aac_find_stsz(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
 
        for (;;) {
                ret = aac_find_stsz(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
-               ret = read(fileno(infile), inbuf, inbuf_size);
+               ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
                if (ret <= 0)
                        return -E_AAC_READ;
                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 %d entries\n", num_chunks);
-       free(chunk_table);
-       chunk_table = para_malloc(num_chunks * sizeof(size_t));
-       for (i = 0; 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, inbuf_size - skip);
+                       ret = read(fileno(infile), inbuf + skip,
+                               AAC_INBUF_SIZE - skip);
                        if (ret <= 0)
                                return -E_AAC_READ;
                        inbuf_len = ret + skip;
                        skip = 0;
                        if (ret <= 0)
                                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);
                }
                sum += aac_read_int32(inbuf + skip);
-               chunk_table[i] = sum;
+               afi->chunk_table[i] = sum;
                skip += 4;
                skip += 4;
-               if (i < 10 || i > num_chunks - 10)
-                       PARA_DEBUG_LOG("offset #%d: %d\n", i, 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;
        }
        return 1;
+}
 
 
+static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
+               mp4AudioSpecificConfig *mp4ASC)
+{
+       float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
+               ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
+       struct timeval total;
+
+       ms2tv(ms, &total);
+       tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+       PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
+               mp4ASC->samplingFrequency, ms / 1000,
+               afi->chunks_total, tv2ms(&afi->chunk_tv));
+       return ms / 1000;
 }
 
 /*
  * Init m4a file and write some tech data to given pointers.
  */
 }
 
 /*
  * Init m4a file and write some tech data to given pointers.
  */
-static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
-       int *seconds)
+static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
 {
 {
-       int ret, skip, decoder_len;
+       int i, ret, decoder_len;
+       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;
        mp4AudioSpecificConfig mp4ASC;
+       NeAACDecHandle handle;
 
 
-       free(inbuf);
-       inbuf_size = DEFAULT_INBUF_SIZE;
-       inbuf = para_malloc(inbuf_size);
        infile = file;
        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);
+       ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
+       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) {
-               PARA_DEBUG_LOG("mp4ASC.samplingFrequency: %lu\n",
-                       mp4ASC.samplingFrequency);
-       } else
-               PARA_WARNING_LOG("no mp4ASC %s\n", "");
-
-       ret = read_chunk_table(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;
-       *frames = 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;
        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
                        break;
-               ret = read(fileno(infile), inbuf, inbuf_size);
-               if (ret <= 0)
-                       return -E_AAC_READ;
+               ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
+               if (ret <= 0) {
+                       ret = -E_AAC_READ;
+                       goto out;
+               }
+               inbuf_len = ret;
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
-       entry = ret;
-       PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks,
-               entry);
-#if 1
-       sprintf(info_str, "audio_file_info1:%d x %lums\n"
+       afi->chunk_table[0] = ret;
+       for (i = 1; i<= afi->chunks_total; i++)
+               afi->chunk_table[i] += ret;
+       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,
-               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, %d chunks\n", *seconds, num_chunks);
-       }
-#endif
-       return 1;
-}
-
-/*
- * Simple stream reposition routine
- */
-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;
-}
-
-char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-       int ret;
-       size_t pos;
-
-       *len = 0;
-       if (current_chunk >= num_chunks)
-               return NULL;
-       if (!current_chunk) {
-               *len = entry;
-               pos = 0;
-       } else if (current_chunk == 1) {
-               *len = chunk_table[0];
-               pos = entry;
-       } else {
-               *len = chunk_table[current_chunk - 1] - chunk_table[current_chunk - 2];
-               pos = entry + chunk_table[current_chunk - 2];
-       }
-       if (inbuf_size < *len) {
-               inbuf = para_realloc(inbuf, *len);
-               inbuf_size = *len;
-       }
-//     PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
-//             pos, *len);
-       ret = fseek(infile, pos, SEEK_SET);
-       if (ret < 0)
-               return NULL;
-       ret = para_fread(inbuf, *len, 1, infile);
-       if (ret != *len)
-               return NULL;
-//     PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0],
-//             (long unsigned) inbuf[4]);
-       return (char *)inbuf;
+               afi->chunks_total,
+               tv2ms(&afi->chunk_tv));
+       tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
+       ret = 1;
+out:
+       free(inbuf);
+       return ret;
 }
 
 }
 
-void aac_afh_init(void *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->reposition_stream = aac_reposition_stream;
-       af->get_file_info = aac_get_file_info,
-       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);
+       p->get_file_info = aac_get_file_info,
+       p->close_audio_file = aac_close_audio_file;
+       p->suffixes = aac_suffixes;
 }
 }