/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
/*
* based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
c->downMatrix = 0;
NeAACDecSetConfiguration(h, c);
return h;
-};
+}
-static int aac_read_decoder_length(unsigned char *buf, int *description_len)
+static unsigned long aac_read_decoder_length(unsigned char *buf, int *description_len)
{
uint8_t b;
uint8_t numBytes = 0;
- uint32_t length = 0;
+ unsigned long length = 0;
do {
b = buf[numBytes];
* \param buflen length of \a buf
* \param skip Upon succesful return, this contains the offset in \a buf where
* the decoder config starts.
+ * \param decoder_length result pointer that is filled in with the length of
+ * the decoder configuration on success.
*
- * \return The length of the decoder configuration
+ * \return positive on success, negative on errors
*/
-ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
+int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
+ unsigned long *decoder_length)
{
size_t i;
for (i = 0; i + 4 < buflen; i++) {
unsigned char *p = buf + i;
- int decoder_length, description_len;
+ int description_len;
if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
continue;
continue;
i++;
p = buf + i;
- decoder_length = aac_read_decoder_length(p, &description_len);
- PARA_INFO_LOG("decoder length: %d\n", decoder_length);
+ *decoder_length = aac_read_decoder_length(p, &description_len);
+ PARA_INFO_LOG("decoder length: %lu\n", *decoder_length);
i += description_len;
*skip = i;
- return decoder_length;
+ return 1;
}
return -E_ESDS;
}
i += 12;
ret = aac_read_int32(buf + i); /* first offset */
i += 4;
- PARA_INFO_LOG("num entries: %zd\n", ret);
+ PARA_INFO_LOG("entry point: %zd\n", ret);
*skip = i;
return ret;
}