X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=2d04695a84305972c6a4d87b1aef77457a8606ad;hp=68f17c275119c8673a12987e449543b3d214f09d;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=343a65bc48b4e0cda4d9a14afcd7e96cca9c5de9 diff --git a/aac_afh.c b/aac_afh.c index 68f17c27..2d04695a 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,15 +8,14 @@ * Ahead Software AG */ -/** \file aac_afh.c para_server's aac audio format handler */ +/** \file aac_afh.c para_server's aac audio format handler. */ + +#include -#include #include "para.h" #include "error.h" -#include "string.h" #include "afh.h" -#include "afs.h" -#include "server.h" +#include "string.h" #include "aac.h" static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip) @@ -43,9 +42,9 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip) return -E_STSZ; } -static int atom_cmp(unsigned char *buf1, char *buf2) +static int atom_cmp(const unsigned char *buf1, const char *buf2) { - unsigned char *b2 = (unsigned char *)buf2; + const unsigned char *b2 = (unsigned char *)buf2; if (buf1[0] != b2[0]) return 1; @@ -192,8 +191,7 @@ static int aac_set_chunk_tv(struct afh_info *afhi, { float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023; struct timeval total; - long unsigned ms = 1000.0 * afhi->chunks_total * tmp - / mp4ASC->samplingFrequency; + long unsigned ms; if (!mp4ASC->samplingFrequency) return -E_MP4ASC;