fix some signed warnings in aac and mp3 decoders

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 17b7225020417e732fa5bf4ea2c0a966b2c73fe0..26cffa3cd3b62f4f6e2138d1eb6b9e39e3a4f2c4 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -22,15 +22,12 @@
 
 /** \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"
 
-static int aac_find_stsz(unsigned char *buf, off_t buflen, off_t *skip)
+static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 {
        int i;
 
@@ -55,7 +52,7 @@ static int aac_find_stsz(unsigned char *buf, off_t buflen, off_t *skip)
 }
 
 static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
-               unsigned char *map, off_t numbytes)
+               unsigned char *map, size_t numbytes)
 {
        int ret, i;
        size_t sum = 0;
@@ -79,25 +76,32 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
        return skip;
 }
 
-static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
-               mp4AudioSpecificConfig *mp4ASC)
+static int aac_set_chunk_tv(struct audio_format_info *afi,
+               mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
 {
-       float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
-               ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
+       float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
        struct timeval total;
+       long unsigned ms = 1000.0 * afi->chunks_total * tmp
+               / mp4ASC->samplingFrequency;
 
+       if (!mp4ASC->samplingFrequency)
+               return -E_MP4ASC;
+       ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
        ms2tv(ms, &total);
        tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
-       PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
+       PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
                mp4ASC->samplingFrequency, ms / 1000,
                afi->chunks_total, tv2ms(&afi->chunk_tv));
-       return ms / 1000;
+       if (ms < 1000)
+               return -E_MP4ASC;
+       *seconds = ms / 1000;
+       return 1;
 }
 
 /*
  * Init m4a file and write some tech data to given pointers.
  */
-static int aac_get_file_info(__a_unused FILE *file, char *map, off_t numbytes,
+static int aac_get_file_info(char *map, size_t numbytes,
                struct audio_format_info *afi)
 {
        int i;
@@ -107,35 +111,48 @@ static int aac_get_file_info(__a_unused FILE *file, char *map, off_t numbytes,
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
        NeAACDecHandle handle;
+       unsigned char *umap = (unsigned char *) map;
 
-       ret = aac_find_esds(map, numbytes, &skip);
+       ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
        if (ret < 0)
                goto out;
-       decoder_len = ret;
        handle = aac_open();
        ret = -E_AACDEC_INIT;
-       if (NeAACDecInit(handle, map + skip, decoder_len, &rate, &channels))
+       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 = -E_MP4ASC;
-       if (NeAACDecAudioSpecificConfig(map + skip, numbytes - skip, &mp4ASC))
+       if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
+               goto out;
+       if (!mp4ASC.samplingFrequency)
                goto out;
-       ret = aac_compute_chunk_table(afi, map, numbytes);
+       ret = aac_compute_chunk_table(afi, umap, numbytes);
        if (ret < 0)
                goto out;
        skip = ret;
-       afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
-       ret = aac_find_entry_point(map + skip, numbytes - skip, &skip);
+       ret = aac_set_chunk_tv(afi, &mp4ASC, &afi->seconds_total);
+       if (ret < 0)
+               goto out;
+       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);
        ret = 1;
 out: