* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
-/** \file aac_afh.c para_server's aac audio format handler */
+/*
+ * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
+ * Ahead Software AG
+ */
+/** \file aac_afh.c para_server's aac audio format handler */
#include "server.cmdline.h"
#include "server.h"
#include "error.h"
#include "string.h"
#include "aac.h"
+#include "fd.h"
/* must be big enough to hold header */
#define DEFAULT_INBUF_SIZE 65536
static FILE *infile;
static int inbuf_size;
static unsigned char *inbuf;
-static unsigned inbuf_len;
-struct audio_format *af;
-
-static unsigned num_chunks, entry;
+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 void aac_close_audio_file(void)
{
+ if (!infile)
+ return;
+ fclose(infile);
+ infile = NULL;
}
-static int read_stsz(unsigned skip)
+static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
+{
+ int i;
+
+ for (i = 0; i + 16 < buflen; i++) {
+ unsigned char *p = buf + i;
+ unsigned sample_count, sample_size;
+
+ if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
+ continue;
+ PARA_INFO_LOG("found stsz@%d\n", i);
+ i += 8;
+ sample_size = aac_read_int32(buf + i);
+ PARA_INFO_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);
+ *skip = i;
+ return sample_count;
+ }
+ PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen);
+ return -E_STSZ;
+}
+
+static int read_chunk_table(size_t skip)
{
int ret, i;
- long unsigned sum = 0;
+ size_t sum = 0;
for (;;) {
ret = aac_find_stsz(inbuf, inbuf_len, &skip);
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
num_chunks = ret;
- PARA_INFO_LOG("sz table has %d entries\n", num_chunks);
+ 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++) {
return -E_AAC_READ;
inbuf_len = ret + skip;
skip = 0;
- PARA_INFO_LOG("next buffer: %d bytes\n", inbuf_len);
+ PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
}
sum += aac_read_int32(inbuf + skip);
chunk_table[i] = sum;
skip += 4;
if (i < 10 || i > num_chunks - 10)
- PARA_DEBUG_LOG("offset #%d: %d\n", i, chunk_table[i]);
+ PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
}
return 1;
}
-
/*
* 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 ret, skip, decoder_len;
+ int ret, decoder_len;
+ size_t skip;
unsigned long rate = 0;
unsigned char channels = 0;
mp4AudioSpecificConfig mp4ASC;
} else
PARA_WARNING_LOG("no mp4ASC %s\n", "");
- ret = read_stsz(skip);
+ ret = read_chunk_table(skip);
if (ret < 0)
return ret;
*frames = num_chunks;
for (;;) {
- ret = aac_find_entry(inbuf, inbuf_len, &skip);
+ ret = aac_find_entry_point(inbuf, inbuf_len, &skip);
if (ret >= 0)
break;
ret = read(fileno(infile), inbuf, inbuf_size);
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
entry = ret;
- PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks,
+ PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
entry);
#if 1
- sprintf(info_str, "audio_file_info1:%d x %lums\n"
+ sprintf(info_str, "audio_file_info1:%zu x %lums\n"
"audio_file_info2:\n"
"audio_file_info3:\n",
num_chunks,
struct timeval total_tv;
tv_scale(num_chunks, &af->chunk_tv, &total_tv);
*seconds = tv2ms(&total_tv) / 1000;
- PARA_INFO_LOG("%d seconds, %d chunks\n", *seconds, num_chunks);
+ PARA_INFO_LOG("%d seconds, %zu chunks\n", *seconds, num_chunks);
}
#endif
return 1;
*/
static int aac_reposition_stream(long unsigned request)
{
- return -E_AAC_REPOS;
-}
-
-static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
- size_t res = fread(ptr, size, nmemb, stream);
- if (res == nmemb)
- return size * nmemb;
- if (feof(stream))
- return 0;
- return -E_FREAD;
+ return 1;
+// return -E_AAC_REPOS;
}
-char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
+static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
{
int ret;
size_t pos;
if (current_chunk >= num_chunks)
return NULL;
if (!current_chunk) {
- *len = entry;
- pos = 0;
- } else if (current_chunk == 1) {
*len = chunk_table[0];
pos = entry;
} else {
- *len = chunk_table[current_chunk - 1] - chunk_table[current_chunk - 2];
- pos = entry + chunk_table[current_chunk - 2];
+ *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);
return (char *)inbuf;
}
+/** the init function of the aac audio format handler */
void aac_afh_init(void *p)
{
af = p;
projects / paraslash.git / blobdiff