X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=e68004b24a4648f09d624e6e428ddc7d3072b27e;hp=92b70915621ce3fd4472d9595adb5b9fe5485636;hb=4cfbdce5e460934d4724cac63aa718ea6c7af199;hpb=1a1048fc81f384826d4cd7416de931f4b6c5646e diff --git a/aac_afh.c b/aac_afh.c index 92b70915..e68004b2 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,31 +24,39 @@ #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 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; +static struct audio_format_handler *af; +static size_t num_chunks; static size_t *chunk_table; -NeAACDecHandle handle; - +static NeAACDecHandle handle; static void aac_close_audio_file(void) { + if (!infile) + 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, unsigned *skip) +static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip) { int i; @@ -73,10 +81,10 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip) return -E_STSZ; } -static int read_chunk_table(unsigned skip) +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); @@ -88,10 +96,9 @@ static int read_chunk_table(unsigned skip) PARA_INFO_LOG("next buffer: %d bytes\n", ret); } num_chunks = ret; - PARA_INFO_LOG("sz table has %d entries\n", num_chunks); - free(chunk_table); - chunk_table = para_malloc(num_chunks * sizeof(size_t)); - for (i = 0; i < num_chunks; i++) { + 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++) { if (skip + 4 > inbuf_len) { skip = inbuf_len - skip; memmove(inbuf, inbuf + inbuf_len - skip, skip); @@ -100,40 +107,50 @@ static int read_chunk_table(unsigned skip) 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]); + if (i < 10 || i + 10 > num_chunks) + PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]); } return 1; +} +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; + struct timeval total; + + ms2tv(ms, &total); + tv_divide(num_chunks, &total, &af->chunk_tv); + PARA_INFO_LOG("%luHz, %fs (%zd x %lums)\n", + mp4ASC->samplingFrequency, ms / 1000, + num_chunks, tv2ms(&af->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) + int *seconds, size_t **vss_chunk_table) { - int ret, skip, decoder_len; + int i, ret, decoder_len; + size_t skip; unsigned long rate = 0; unsigned char channels = 0; mp4AudioSpecificConfig mp4ASC; - free(inbuf); inbuf_size = DEFAULT_INBUF_SIZE; inbuf = para_malloc(inbuf_size); infile = file; - PARA_INFO_LOG("file: %p\n", file); ret = read(fileno(infile), inbuf, inbuf_size); - PARA_INFO_LOG("read %d bytes\n", ret); if (ret <= 0) return -E_AAC_READ; - PARA_INFO_LOG("checking aac %d bytes\n", ret); inbuf_len = ret; ret = aac_find_esds(inbuf, inbuf_len, &skip); if (ret < 0) @@ -146,17 +163,16 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, return -E_AACDEC_INIT; skip += ret; PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels); - ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip, &mp4ASC); - if (ret >= 0) { - PARA_DEBUG_LOG("mp4ASC.samplingFrequency: %lu\n", - mp4ASC.samplingFrequency); - } else - PARA_WARNING_LOG("no mp4ASC %s\n", ""); - + ret = NeAACDecAudioSpecificConfig(inbuf + skip, inbuf_len - skip, + &mp4ASC); + if (ret < 0) + return -E_MP4ASC; ret = read_chunk_table(skip); if (ret < 0) 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) @@ -166,87 +182,25 @@ 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; - PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks, - entry); -#if 1 - sprintf(info_str, "audio_file_info1:%d x %lums\n" + 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)); -#endif -#if 1 - { - 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); - } -#endif - return 1; -} - -/* - * Simple stream reposition routine - */ -static int aac_reposition_stream(long unsigned request) -{ + tv_scale(20, &af->chunk_tv, &af->eof_tv); return 1; -// 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; -} - -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; } -void aac_afh_init(void *p) +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->chunk_tv.tv_sec = 0; - af->chunk_tv.tv_usec = 23120; - tv_scale(3, &af->chunk_tv, &af->eof_tv); + af->suffixes = aac_suffixes; }