/*
* Copyright (C) 2006-2007 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,
* return value of aac_find_esds(). Used to call the right aacdec
* init function
*/
- int decoder_length;
+ unsigned long decoder_length;
/** number of times the decoder returned an error */
unsigned error_count;
/** number of bytes already consumed from the imput stream */
if (!padd->initialized) {
unsigned long rate = 0;
unsigned char channels = 0;
- padd->decoder_length = aac_find_esds(inbuf, len, &skip);
- PARA_INFO_LOG("decoder len: %d\n", padd->decoder_length);
- if (padd->decoder_length < 0) {
+ ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
+ if (ret < 0) {
+ PARA_INFO_LOG("%s\n", PARA_STRERROR(-ret));
ret = NeAACDecInit(padd->handle, inbuf,
len, &rate, &channels);
PARA_INFO_LOG("decoder init: %d\n", ret);
}
consumed = ret;
} else {
+ PARA_INFO_LOG("decoder len: %lu\n",
+ padd->decoder_length);
consumed += skip;
p = inbuf + consumed;
ret = -E_AACDEC_INIT;
goto out;
for (i = 0; i < padd->frame_info.samples; i++) {
short *s = (short *)outbuffer;
- fn->buf[fn->loaded++] = s[i] & 0xff;
- fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
+ write_int16_host_endian(fn->buf + fn->loaded, s[i]);
+ fn->loaded += 2;
}
success:
ret = consumed;