/** \file aac_afh.c para_server's aac audio format handler */
-#include "server.h"
+#include "para.h"
#include "error.h"
#include "string.h"
+#include "afh.h"
+#include "afs.h"
+#include "server.h"
#include "aac.h"
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;
- 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);
- 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;
- PARA_INFO_LOG("sample count: %d\n", sample_count);
+ PARA_DEBUG_LOG("sample count: %d\n", sample_count);
*skip = i;
return sample_count;
}
return -E_STSZ;
}
-static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
+static ssize_t aac_compute_chunk_table(struct afh_info *afi,
unsigned char *map, size_t numbytes)
{
int ret, i;
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)
return skip;
}
-static int aac_set_chunk_tv(struct audio_format_info *afi,
+static int aac_set_chunk_tv(struct afh_info *afi,
mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
{
float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
* Init m4a file and write some tech data to given pointers.
*/
static int aac_get_file_info(char *map, size_t numbytes,
- struct audio_format_info *afi)
+ struct afh_info *afi)
{
int i;
size_t skip;
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);
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;
tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
ret = 1;
out:
+ if (handle)
+ NeAACDecClose(handle);
return ret;
}