aac: fix some signedness warnings
[paraslash.git] / aac_afh.c
index 58e2385..8b635c4 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
 
 /** \file aac_afh.c para_server's aac audio format handler */
 
-#include "server.cmdline.h"
 #include "server.h"
-#include "vss.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
-#include "fd.h"
 
-/** 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;
-       free(inbuf);
-       inbuf = NULL;
-}
-
-static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
+static int aac_find_stsz(unsigned char *buf, off_t buflen, off_t *skip)
 {
        int i;
 
@@ -68,45 +48,32 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
                *skip = i;
                return sample_count;
        }
-       PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
        return -E_STSZ;
 }
 
-static int read_chunk_table(struct audio_format_info *afi, size_t skip)
+static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+               unsigned char *map, off_t numbytes)
 {
        int ret, i;
        size_t sum = 0;
+       off_t skip;
 
-       for (;;) {
-               ret = aac_find_stsz(inbuf, inbuf_len, &skip);
-               if (ret >= 0)
-                       break;
-               ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
-               if (ret <= 0)
-                       return -E_AAC_READ;
-               PARA_INFO_LOG("next buffer: %d bytes\n", ret);
-       }
+       ret = aac_find_stsz(map, numbytes, &skip);
+       if (ret < 0)
+               return ret;
        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);
-                       ret = read(fileno(infile), inbuf + skip, AAC_INBUF_SIZE - skip);
-                       if (ret <= 0)
-                               return -E_AAC_READ;
-                       inbuf_len = ret + skip;
-                       skip = 0;
-                       PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
-               }
-               sum += aac_read_int32(inbuf + skip);
+               if (skip + 4 > numbytes)
+                       break;
+               sum += aac_read_int32(map + 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;
+       return skip;
 }
 
 static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
@@ -121,73 +88,77 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
        PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
                mp4ASC->samplingFrequency, ms / 1000,
                afi->chunks_total, tv2ms(&afi->chunk_tv));
-       return ms / 1000;
+       return ms < 1000? -E_MP4ASC : ms / 1000;
 }
 
 /*
  * 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(char *map, off_t numbytes,
+               struct audio_format_info *afi)
 {
-       int i, ret, decoder_len;
+       int i;
        size_t skip;
-       unsigned long rate = 0;
+       ssize_t ret;
+       unsigned long rate = 0, decoder_len;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
        NeAACDecHandle handle;
+       unsigned char *umap = (unsigned char *) map;
 
-       inbuf = para_malloc(AAC_INBUF_SIZE);
-       infile = file;
-
-       ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
-       if (ret <= 0)
-               return -E_AAC_READ;
-       inbuf_len = ret;
-       ret = aac_find_esds(inbuf, inbuf_len, &skip);
+       ret = aac_find_esds(umap, numbytes, &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;
-       skip += ret;
+       ret = -E_AACDEC_INIT;
+       if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels))
+               goto out;
+       if (!channels)
+               goto out;
        PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
-       ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip,
-               &mp4ASC);
+       ret = -E_MP4ASC;
+       if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
+               goto out;
+       if (!mp4ASC.samplingFrequency)
+               goto out;
+       ret = aac_compute_chunk_table(afi, umap, numbytes);
        if (ret < 0)
-               return -E_MP4ASC;
-       ret = read_chunk_table(afi, skip);
-       if (ret < 0)
-               return ret;
+               goto out;
+       skip = ret;
        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;
-               PARA_INFO_LOG("next buffer: %d bytes\n", ret);
-       }
+       ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip);
+       if (ret < 0)
+               goto out;
        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"
+       afi->channels = channels;
+       afi->frequency = rate;
+       ret = (afi->chunk_table[afi->chunks_total] - afi->chunk_table[0]) * 8; /* bits */
+       ret += (channels * afi->seconds_total * 500); /* avoid rounding error */
+       afi->bitrate = ret / (channels * afi->seconds_total * 1000);
+       sprintf(afi->info_string, "audio_file_info1:%lu x %lums, "
+               "%uHz, %d channel%s, %ukb/s\n"
                "audio_file_info2:\n"
                "audio_file_info3:\n",
-               afi->chunks_total,
-               tv2ms(&afi->chunk_tv));
+               afi->chunks_total, tv2ms(&afi->chunk_tv),
+               afi->frequency, channels, channels == 1? "" : "s", afi->bitrate
+       );
        tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
-       return 1;
+       ret = 1;
+out:
+       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)
+/**
+ * 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;
 }