unify all audio format handlers

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index d4a1866aeda37132531153c84c17d2f92a5b0f51..338b7827caf1d8d5a4399214c6c9dff92aaa77c3 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


@@ -24,29 +24,36 @@
 
 #include "server.cmdline.h"
 #include "server.h"
 
 #include "server.cmdline.h"
 #include "server.h"

-#include "afs.h"
+#include "vss.h"
+#include "afh.h"

 #include "error.h"
 #include "string.h"
 #include "aac.h"
 #include "fd.h"
 
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 #include "fd.h"
 

-/* must be big enough to hold header */
+/** size of the input buffer, must be big enough to hold header */

 #define DEFAULT_INBUF_SIZE 65536
 
 static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;
 #define DEFAULT_INBUF_SIZE 65536
 
 static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;

-struct audio_format *af;
+static struct audio_format_handler *af;

 static size_t num_chunks;
 static size_t num_chunks;

-static size_t entry;

 
 static size_t *chunk_table;
 
 static size_t *chunk_table;

-NeAACDecHandle handle;
-
+static NeAACDecHandle handle;

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

+       if (!infile)
+               return;
+       fclose(infile);
+       infile = NULL;
+       free(inbuf);
+       inbuf = NULL;
+       free(chunk_table);
+       chunk_table = 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)


@@ -90,9 +97,8 @@ static int read_chunk_table(size_t skip)
        }
        num_chunks = ret;
        PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
        }
        num_chunks = ret;
        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++) {
+       chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
+       for (i = 1; i <= num_chunks; 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);


@@ -106,11 +112,24 @@ static int read_chunk_table(size_t skip)
                sum += aac_read_int32(inbuf + skip);
                chunk_table[i] = sum;
                skip += 4;
                sum += aac_read_int32(inbuf + skip);
                chunk_table[i] = sum;
                skip += 4;

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

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

+}

 
 

+static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+{
+       float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
+               ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
+       struct timeval total;
+
+       ms2tv(ms, &total);
+       tv_divide(num_chunks, &total, &af->chunk_tv);
+       PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+               mp4ASC->samplingFrequency, ms / 1000,
+               num_chunks, tv2ms(&af->chunk_tv));
+       return ms / 1000;

 }
 
 /*
 }
 
 /*


@@ -119,23 +138,19 @@ static int read_chunk_table(size_t skip)
 static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        int *seconds)
 {
 static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        int *seconds)
 {

-       int ret, decoder_len;
+       int i, ret, decoder_len;

        size_t skip;
        unsigned long rate = 0;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
 
        size_t skip;
        unsigned long rate = 0;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
 

-       free(inbuf);

        inbuf_size = DEFAULT_INBUF_SIZE;
        inbuf = para_malloc(inbuf_size);
        infile = file;
 
        inbuf_size = DEFAULT_INBUF_SIZE;
        inbuf = para_malloc(inbuf_size);
        infile = file;
 

-       PARA_INFO_LOG("file: %p\n", file);

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

-       PARA_INFO_LOG("read %d bytes\n", ret);

        if (ret <= 0)
                return -E_AAC_READ;
        if (ret <= 0)
                return -E_AAC_READ;

-       PARA_INFO_LOG("checking aac %d bytes\n", ret);

        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)


@@ -148,17 +163,15 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                return -E_AACDEC_INIT;
        skip += ret;
        PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
                return -E_AACDEC_INIT;
        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 = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
+               &mp4ASC);
+       if (ret < 0)
+               return -E_MP4ASC;

        ret = read_chunk_table(skip);
        if (ret < 0)
                return ret;
        *frames = num_chunks;
        ret = read_chunk_table(skip);
        if (ret < 0)
                return ret;
        *frames = num_chunks;

+       *seconds = aac_set_chunk_tv(&mp4ASC);

        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)
        for (;;) {
                ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
                if (ret >= 0)


@@ -168,34 +181,24 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
                        return -E_AAC_READ;
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }
                        return -E_AAC_READ;
                PARA_INFO_LOG("next buffer: %d bytes\n", ret);
        }

-       entry = ret;
-       PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
-               entry);
-#if 1
+       chunk_table[0] = ret;
+       for (i = 1; i<= num_chunks; i++)
+               chunk_table[i] += ret;

        sprintf(info_str, "audio_file_info1:%zu x %lums\n"
                "audio_file_info2:\n"
                "audio_file_info3:\n",
                num_chunks,
                tv2ms(&af->chunk_tv));
        sprintf(info_str, "audio_file_info1:%zu x %lums\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, %zu chunks\n", *seconds, num_chunks);
-       }
-#endif
+       tv_scale(20, &af->chunk_tv, &af->eof_tv);

        return 1;
 }
 
 /*
        return 1;
 }
 
 /*

- * Simple stream reposition routine
+ * nothing to do as we'll seek to the correct offset in aac read_chunk() anyway

  */
  */

-static int aac_reposition_stream(long unsigned request)
+static int aac_reposition_stream(__a_unused long unsigned request)

 {
        return 1;
 {
        return 1;

-//     return -E_AAC_REPOS;

 }
 
 static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
 }
 
 static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)


@@ -206,14 +209,13 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        *len = 0;
        if (current_chunk >= num_chunks)
                return NULL;
        *len = 0;
        if (current_chunk >= num_chunks)
                return NULL;

-       if (!current_chunk) {
-               *len = chunk_table[0];
-               pos = entry;
-       } else {
-               *len = chunk_table[current_chunk] - chunk_table[current_chunk - 1];
-               pos = entry + chunk_table[current_chunk - 1];
-       }
+       *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk];
+       if (!*len) /* nothing to send for this run */
+               return inbuf;
+       pos = chunk_table[current_chunk];

        if (inbuf_size < *len) {
        if (inbuf_size < *len) {

+               PARA_INFO_LOG("increasing inbuf for chunk #%lu/%zu to %zd bytes\n",
+                       current_chunk, num_chunks, *len);

                inbuf = para_realloc(inbuf, *len);
                inbuf_size = *len;
        }
                inbuf = para_realloc(inbuf, *len);
                inbuf_size = *len;
        }


@@ -230,7 +232,10 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        return (char *)inbuf;
 }
 
        return (char *)inbuf;
 }
 

-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 = p;
        af->reposition_stream = aac_reposition_stream;


@@ -238,7 +243,5 @@ void aac_afh_init(void *p)
        af->read_chunk = aac_read_chunk;
        af->close_audio_file = aac_close_audio_file;
        af->get_header_info = NULL;
        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);
+       af->suffixes = aac_suffixes;

 }
 }