X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=5e5ea965eb3d31ba3241928132b4ed7594719163;hp=1f3ea6b3040dd9eafe52839a79931b9398c235f7;hb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9;hpb=298ad3958d76fc775dfd0503ae4b1e43dce70f04 diff --git a/aac_afh.c b/aac_afh.c index 1f3ea6b3..5e5ea965 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2007 Andre Noll * * 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 @@ -24,25 +24,19 @@ #include "server.cmdline.h" #include "server.h" -#include "afs.h" +#include "vss.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, num_chunks; static void aac_close_audio_file(void) { @@ -50,6 +44,8 @@ static void aac_close_audio_file(void) return; fclose(infile); infile = NULL; + free(inbuf); + inbuf = NULL; } static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip) @@ -77,7 +73,7 @@ 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; @@ -93,9 +89,8 @@ static int read_chunk_table(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++) { + afi->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); @@ -107,42 +102,41 @@ static int read_chunk_table(size_t 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]); + PARA_DEBUG_LOG("offset #%d: %zu\n", i, afi->chunk_table[i]); } return 1; - } -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; struct timeval total; ms2tv(ms, &total); - tv_divide(num_chunks, &total, &af->chunk_tv); + tv_divide(num_chunks, &total, &afi->chunk_tv); PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n", mp4ASC->samplingFrequency, ms / 1000, - num_chunks, tv2ms(&af->chunk_tv)); + num_chunks, 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) +static int aac_get_file_info(FILE *file, struct audio_format_info *afi) { - 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; @@ -166,11 +160,11 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, &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); + afi->chunks_total = num_chunks; + afi->seconds_total = aac_set_chunk_tv(afi, &mp4ASC); for (;;) { ret = aac_find_entry_point(inbuf, inbuf_len, &skip); if (ret >= 0) @@ -180,66 +174,24 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, return -E_AAC_READ; PARA_INFO_LOG("next buffer: %d bytes\n", ret); } - entry = ret; - sprintf(info_str, "audio_file_info1:%zu x %lums\n" + afi->chunk_table[0] = ret; + for (i = 1; i<= num_chunks; i++) + afi->chunk_table[i] += ret; + sprintf(afi->info_string, "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) -{ + tv2ms(&afi->chunk_tv)); + tv_scale(20, &afi->chunk_tv, &afi->eof_tv); 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; af->suffixes = aac_suffixes; }