/** \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)
{
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;
}
/*
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;
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: