aac: fix some signedness warnings
[paraslash.git] / aac_afh.c
index 13e9c5d..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"
 
 static int aac_find_stsz(unsigned char *buf, off_t buflen, off_t *skip)
 {
@@ -107,29 +104,30 @@ static int aac_get_file_info(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);
        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_find_entry_point(umap + skip, numbytes - skip, &skip);
        if (ret < 0)
                goto out;
        afi->chunk_table[0] = ret;