/*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
* 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 <regex.h>
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;
q = p + ret + ret2 + 8;
if (q + size2 > buf + buflen)
break;
- if (!atom_cmp(type1, "©ART"))
+ if (!atom_cmp(type1, "\xa9" "ART"))
afhi->tags.artist = get_tag(q, size2);
- else if (!atom_cmp(type1, "©alb"))
+ else if (!atom_cmp(type1, "\xa9" "alb"))
afhi->tags.album = get_tag(q, size2);
- else if (!atom_cmp(type1, "©nam"))
+ else if (!atom_cmp(type1, "\xa9" "nam"))
afhi->tags.title = get_tag(q, size2);
- else if (!atom_cmp(type1, "©cmt"))
+ else if (!atom_cmp(type1, "\xa9" "cmt"))
afhi->tags.comment = get_tag(q, size2);
- else if (!atom_cmp(type1, "©day"))
+ else if (!atom_cmp(type1, "\xa9" "day"))
afhi->tags.year = get_tag(q, size2);
p += size1;
}
{
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;