/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "server.cmdline.h"
#include "server.h"
-#include "afs.h"
+#include "vss.h"
+#include "afh.h"
#include "error.h"
#include "string.h"
#include "aac.h"
#include "fd.h"
-/* must be big enough to hold header */
+/** size of the input buffer, must be big enough to hold header */
#define DEFAULT_INBUF_SIZE 65536
+static struct audio_format_handler *af;
static FILE *infile;
-static int inbuf_size;
static unsigned char *inbuf;
-static size_t inbuf_len;
-struct audio_format_handler *af;
-static size_t num_chunks;
-static size_t entry;
-
-static size_t *chunk_table;
-NeAACDecHandle handle;
+static size_t inbuf_size, inbuf_len, *chunk_table, num_chunks;
static void aac_close_audio_file(void)
{
return;
fclose(infile);
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)
}
num_chunks = ret;
PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
- free(chunk_table);
- chunk_table = para_malloc(num_chunks * sizeof(size_t));
- for (i = 0; i < num_chunks; i++) {
+ chunk_table = para_malloc((num_chunks + 1) * sizeof(size_t));
+ for (i = 1; i <= num_chunks; i++) {
if (skip + 4 > inbuf_len) {
skip = inbuf_len - skip;
memmove(inbuf, inbuf + inbuf_len - skip, skip);
PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
}
return 1;
-
}
-long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
+static long unsigned aac_set_chunk_tv(mp4AudioSpecificConfig *mp4ASC)
{
float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023,
ms = 1000.0 * num_chunks * tmp / mp4ASC->samplingFrequency;
* 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)
+ int *seconds, size_t **vss_chunk_table)
{
- int ret, decoder_len;
+ int i, ret, decoder_len;
size_t skip;
unsigned long rate = 0;
unsigned char channels = 0;
mp4AudioSpecificConfig mp4ASC;
+ NeAACDecHandle handle;
- free(inbuf);
inbuf_size = DEFAULT_INBUF_SIZE;
inbuf = para_malloc(inbuf_size);
infile = file;
return ret;
*frames = num_chunks;
*seconds = aac_set_chunk_tv(&mp4ASC);
+ *vss_chunk_table = chunk_table;
for (;;) {
ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
if (ret >= 0)
return -E_AAC_READ;
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
- entry = 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"
"audio_file_info2:\n"
"audio_file_info3:\n",
num_chunks,
tv2ms(&af->chunk_tv));
+ tv_scale(20, &af->chunk_tv, &af->eof_tv);
return 1;
}
-/*
- * Simple stream reposition routine
- */
-static int aac_reposition_stream(long unsigned request)
-{
- return 1;
-// return -E_AAC_REPOS;
-}
-
-static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
- int ret;
- size_t pos;
-
- *len = 0;
- if (current_chunk >= num_chunks)
- return NULL;
- if (!current_chunk) {
- *len = chunk_table[0];
- pos = entry;
- } else {
- *len = chunk_table[current_chunk] - chunk_table[current_chunk - 1];
- pos = entry + chunk_table[current_chunk - 1];
- }
- if (inbuf_size < *len) {
- inbuf = para_realloc(inbuf, *len);
- inbuf_size = *len;
- }
-// PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk,
-// pos, *len);
- ret = fseek(infile, pos, SEEK_SET);
- if (ret < 0)
- return NULL;
- ret = para_fread(inbuf, *len, 1, infile);
- if (ret != *len)
- return NULL;
-// PARA_DEBUG_LOG("ret: %d, inbuf[0]: %lx - %lx\n", ret, (long unsigned) inbuf[0],
-// (long unsigned) inbuf[4]);
- return (char *)inbuf;
-}
-
-static const char* aac_suffixes[] = {"m4a", NULL};
+static const char* aac_suffixes[] = {"m4a", "mp4", NULL};
/** the init function of the aac audio format handler */
void aac_afh_init(struct audio_format_handler *p)
{
af = p;
- af->reposition_stream = aac_reposition_stream;
af->get_file_info = aac_get_file_info,
- af->read_chunk = aac_read_chunk;
af->close_audio_file = aac_close_audio_file;
af->get_header_info = NULL;
- tv_scale(3, &af->chunk_tv, &af->eof_tv);
af->suffixes = aac_suffixes;
}