X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=706e18a61057ba04be92a474b77014498fb9f992;hp=bf402f091968254a0c120eec5f762f1180aaf2c0;hb=bdbd406ea189f5548199cc8e2093b80e06a43b93;hpb=2c6032259d6536daabd4132a3737cac08ebdd018 diff --git a/aac_afh.c b/aac_afh.c index bf402f09..706e18a6 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -22,9 +22,7 @@ /** \file aac_afh.c para_server's aac audio format handler */ -#include "server.cmdline.h" #include "server.h" -#include "vss.h" #include "error.h" #include "string.h" #include "aac.h" @@ -91,7 +89,7 @@ static long unsigned aac_set_chunk_tv(struct audio_format_info *afi, PARA_INFO_LOG("%luHz, %fs (%lu x %lums)\n", mp4ASC->samplingFrequency, ms / 1000, afi->chunks_total, tv2ms(&afi->chunk_tv)); - return ms / 1000; + return ms < 1000? -E_MP4ASC : ms / 1000; } /* @@ -116,10 +114,14 @@ static int aac_get_file_info(char *map, off_t numbytes, ret = -E_AACDEC_INIT; if (NeAACDecInit(handle, map + skip, decoder_len, &rate, &channels)) goto out; + if (!channels) + goto out; PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels); ret = -E_MP4ASC; if (NeAACDecAudioSpecificConfig(map + skip, numbytes - skip, &mp4ASC)) goto out; + if (!mp4ASC.samplingFrequency) + goto out; ret = aac_compute_chunk_table(afi, map, numbytes); if (ret < 0) goto out; @@ -131,11 +133,18 @@ static int aac_get_file_info(char *map, off_t numbytes, 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" + afi->channels = channels; + afi->frequency = rate; + ret = (afi->chunk_table[afi->chunks_total] - afi->chunk_table[0]) * 8; /* bits */ + ret += (channels * afi->seconds_total * 500); /* avoid rounding error */ + afi->bitrate = ret / (channels * afi->seconds_total * 1000); + sprintf(afi->info_string, "audio_file_info1:%lu x %lums, " + "%uHz, %d channel%s, %ukb/s\n" "audio_file_info2:\n" "audio_file_info3:\n", - afi->chunks_total, - tv2ms(&afi->chunk_tv)); + afi->chunks_total, tv2ms(&afi->chunk_tv), + afi->frequency, channels, channels == 1? "" : "s", afi->bitrate + ); tv_scale(20, &afi->chunk_tv, &afi->eof_tv); ret = 1; out: