osx_write.c: Add two missing headers.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index be301c5ce38f530bf29ddef4781f89c4d2b4926b..d0d437e90a31bade448b3a31165bf82dfe15d2ea 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -10,6 +10,8 @@
 
 /** \file aac_afh.c para_server's aac audio format handler */
 
 
 /** \file aac_afh.c para_server's aac audio format handler */
 

+#include "para.h"
+#include "afh.h"

 #include "server.h"
 #include "error.h"
 #include "string.h"
 #include "server.h"
 #include "error.h"
 #include "string.h"


@@ -25,14 +27,14 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 
                if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
                        continue;
 
                if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
                        continue;

-               PARA_INFO_LOG("found stsz@%d\n", i);
+               PARA_DEBUG_LOG("found stsz@%d\n", i);

                i += 8;
                sample_size = aac_read_int32(buf + i);
                i += 8;
                sample_size = aac_read_int32(buf + i);

-               PARA_INFO_LOG("sample size: %d\n", sample_size);
+               PARA_DEBUG_LOG("sample size: %d\n", sample_size);

                i += 4;
                sample_count = aac_read_int32(buf + i);
                i += 4;
                i += 4;
                sample_count = aac_read_int32(buf + i);
                i += 4;

-               PARA_INFO_LOG("sample count: %d\n", sample_count);
+               PARA_DEBUG_LOG("sample count: %d\n", sample_count);

                *skip = i;
                return sample_count;
        }
                *skip = i;
                return sample_count;
        }


@@ -50,7 +52,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
        if (ret < 0)
                return ret;
        afi->chunks_total = ret;
        if (ret < 0)
                return ret;
        afi->chunks_total = ret;

-       PARA_INFO_LOG("sz table has %lu entries\n", afi->chunks_total);
+       PARA_DEBUG_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 > numbytes)
        afi->chunk_table = para_malloc((afi->chunks_total + 1) * sizeof(size_t));
        for (i = 1; i <= afi->chunks_total; i++) {
                if (skip + 4 > numbytes)


@@ -98,7 +100,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
        unsigned long rate = 0, decoder_len;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;
        unsigned long rate = 0, decoder_len;
        unsigned char channels = 0;
        mp4AudioSpecificConfig mp4ASC;

-       NeAACDecHandle handle;
+       NeAACDecHandle handle = NULL;

        unsigned char *umap = (unsigned char *) map;
 
        ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
        unsigned char *umap = (unsigned char *) map;
 
        ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);


@@ -110,7 +112,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
                goto out;
        if (!channels)
                goto out;
                goto out;
        if (!channels)
                goto out;

-       PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
+       PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels);

        ret = -E_MP4ASC;
        if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
                goto out;
        ret = -E_MP4ASC;
        if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
                goto out;


@@ -144,6 +146,8 @@ static int aac_get_file_info(char *map, size_t numbytes,
        tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
        ret = 1;
 out:
        tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
        ret = 1;
 out:

+       if (handle)
+               NeAACDecClose(handle);

        return ret;
 }
 
        return ret;
 }