#include "server.cmdline.h"
#include "server.h"
#include "vss.h"
-#include "afh.h"
#include "error.h"
#include "string.h"
#include "aac.h"
#include "fd.h"
/** size of the input buffer, must be big enough to hold header */
-#define DEFAULT_INBUF_SIZE 65536
+#define AAC_INBUF_SIZE 65536
static struct audio_format_handler *af;
static FILE *infile;
static unsigned char *inbuf;
-static size_t inbuf_size, inbuf_len, *chunk_table, num_chunks;
+static size_t inbuf_len;
static void aac_close_audio_file(void)
{
infile = NULL;
free(inbuf);
inbuf = NULL;
- free(chunk_table);
- chunk_table = NULL;
}
static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
return -E_STSZ;
}
-static int read_chunk_table(size_t skip)
+static int read_chunk_table(struct audio_format_info *afi, size_t skip)
{
int ret, i;
size_t sum = 0;
ret = aac_find_stsz(inbuf, inbuf_len, &skip);
if (ret >= 0)
break;
- ret = read(fileno(infile), inbuf, inbuf_size);
+ ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
if (ret <= 0)
return -E_AAC_READ;
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
- num_chunks = ret;
- PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
- chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
- for (i = 1; i <= num_chunks; i++) {
+ afi->chunks_total = ret;
+ PARA_INFO_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 > inbuf_len) {
skip = inbuf_len - skip;
memmove(inbuf, inbuf + inbuf_len - skip, skip);
- ret = read(fileno(infile), inbuf + skip, inbuf_size - skip);
+ ret = read(fileno(infile), inbuf + skip, AAC_INBUF_SIZE - skip);
if (ret <= 0)
return -E_AAC_READ;
inbuf_len = ret + skip;
PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
}
sum += aac_read_int32(inbuf + skip);
- chunk_table[i] = sum;
+ afi->chunk_table[i] = sum;
skip += 4;
- if (i < 10 || i + 10 > num_chunks)
- PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
+ if (i < 10 || i + 10 > afi->chunks_total)
+ PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]);
}
return 1;
}
-static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+static long unsigned aac_set_chunk_tv(struct audio_format_info *afi,
+ mp4AudioSpecificConfig *mp4ASC)
{
float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
- ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
+ ms = 1000.0 * afi->chunks_total * tmp / mp4ASC->samplingFrequency;
struct timeval total;
ms2tv(ms, &total);
- tv_divide(num_chunks, &total, &af->chunk_tv);
- PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n",
+ tv_divide(afi->chunks_total, &total, &afi->chunk_tv);
+ PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n",
mp4ASC->samplingFrequency, ms / 1000,
- num_chunks, tv2ms(&af->chunk_tv));
+ afi->chunks_total, tv2ms(&afi->chunk_tv));
return ms / 1000;
}
/*
* Init m4a file and write some tech data to given pointers.
*/
-static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
- int *seconds, size_t **vss_chunk_table)
+static int aac_get_file_info(FILE *file, struct audio_format_info *afi)
{
int i, ret, decoder_len;
size_t skip;
mp4AudioSpecificConfig mp4ASC;
NeAACDecHandle handle;
- inbuf_size = DEFAULT_INBUF_SIZE;
- inbuf = para_malloc(inbuf_size);
+ inbuf = para_malloc(AAC_INBUF_SIZE);
infile = file;
- ret = read(fileno(infile), inbuf, inbuf_size);
+ ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
if (ret <= 0)
return -E_AAC_READ;
inbuf_len = ret;
&mp4ASC);
if (ret < 0)
return -E_MP4ASC;
- ret = read_chunk_table(skip);
+ ret = read_chunk_table(afi, skip);
if (ret < 0)
return ret;
- *frames = num_chunks;
- *seconds = aac_set_chunk_tv(&mp4ASC);
- *vss_chunk_table = chunk_table;
+ afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC);
for (;;) {
ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
if (ret >= 0)
break;
- ret = read(fileno(infile), inbuf, inbuf_size);
+ ret = read(fileno(infile), inbuf, AAC_INBUF_SIZE);
if (ret <= 0)
return -E_AAC_READ;
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
- chunk_table[0] = ret;
- for (i = 1; i<= num_chunks; i++)
- chunk_table[i] += ret;
- sprintf(info_str, "audio_file_info1:%zu x %lums\n"
+ 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"
"audio_file_info2:\n"
"audio_file_info3:\n",
- num_chunks,
- tv2ms(&af->chunk_tv));
- tv_scale(20, &af->chunk_tv, &af->eof_tv);
+ afi->chunks_total,
+ tv2ms(&afi->chunk_tv));
+ tv_scale(20, &afi->chunk_tv, &afi->eof_tv);
return 1;
}
af = p;
af->get_file_info = aac_get_file_info,
af->close_audio_file = aac_close_audio_file;
- af->get_header_info = NULL;
af->suffixes = aac_suffixes;
}