* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+/*
+ * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
+ * Ahead Software AG
+ */
+
/** \file aacdec.c paraslash's mp3 decoder */
#include "para.h"
mp4AudioSpecificConfig mp4ASC;
int initialized;
- char *inbuf;
+ int decoder_length;
+ unsigned char *inbuf;
int inbuf_len;
int consumed;
long unsigned consumed_total;
- int noffsets;
- int *offset;
+ unsigned noffsets;
+ unsigned *offset;
int offset_pos;
-
-#if 0
- int nsamples;
- int *table;
- int table_pos;
-#endif
};
static int read_mp4_descr_length(struct private_mp4dec_data *padd)
static int find_esds(struct private_mp4dec_data *padd)
{
for (; padd->consumed < padd->inbuf_len; padd->consumed++) {
- char *p = padd->inbuf + padd->consumed;
+ unsigned char *p = padd->inbuf + padd->consumed;
int decoder_length;
if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
return 1;
}
-#if 0
-int fill_table(struct private_mp4dec_data *padd)
-{
- int i, ret;
-
- for (i = padd->table_pos; i < padd->nsamples; i++) {
- ret = read_int32(padd, &padd->table[i]);
- if (ret < 0)
- return -1;
- PARA_DEBUG_LOG("sample #%d: %d\n", i, padd->table[i]);
- padd->table_pos++;
- }
- return 1;
-
-}
-int find_stsz(struct private_mp4dec_data *padd)
-{
- int ret;
-
- for (; padd->consumed < padd->inbuf_len; padd->consumed++) {
- char *p = padd->inbuf + padd->consumed;
-
- if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
- continue;
- PARA_INFO_LOG("found stsz: %d\n", padd->consumed);
- padd->consumed += 12;
- ret = -E_STSZ;
- if (read_int32(padd, &padd->nsamples) < 0)
- goto out;
- PARA_INFO_LOG("num samples: %d\n", padd->nsamples);
- padd->table = para_malloc(padd->nsamples * sizeof(int));
- return 1;
- }
- ret = -E_STSZ;
-out:
- return ret;
-}
-#endif
-
static int fill_offset_table(struct private_mp4dec_data *padd)
{
int i, ret;
int ret;
for (; padd->consumed < padd->inbuf_len; padd->consumed++) {
- char *p = padd->inbuf + padd->consumed;
+ unsigned char *p = padd->inbuf + padd->consumed;
if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
continue;
if (fn->loaded > fn->bufsize * 4 / 5)
return 0;
- if (len < 10 && !*fci->eof)
+ if (len < 1000 && !*fci->eof)
return 0;
padd->consumed = 0;
- padd->inbuf = inbuffer;
+ padd->inbuf = (unsigned char*)inbuffer;
padd->inbuf_len = len;
if (!padd->initialized) {
- ret = find_esds(padd);
- if (ret < 0)
- goto out;
-
- p = inbuffer + padd->consumed;
- ret = E_AACDEC_INIT;
- if (NeAACDecInit2(padd->decoder, p, ret, &rate, &channels) < 0) {
- PARA_INFO_LOG("header not found, consumed: %d\n",
- padd->consumed);
- goto out;
+ padd->decoder_length = find_esds(padd);
+ if (padd->decoder_length < 0) {
+ ret = NeAACDecInit(padd->decoder, padd->inbuf,
+ padd->inbuf_len, &rate, &channels);
+ if (ret < 0) {
+ ret = E_AACDEC_INIT;
+ goto out;
+ }
+ padd->consumed = ret;
+ } else {
+ p = padd->inbuf + padd->consumed;
+ ret = E_AACDEC_INIT;
+ if (NeAACDecInit2(padd->decoder, p,
+ padd->decoder_length, &rate,
+ &channels) < 0)
+ goto out;
}
fci->samplerate = rate;
fci->channels = channels;
fci->channels);
padd->initialized = 1;
}
- padd->consumed = 0;
-#if 0
- if (!padd->table_pos) {
- ret = find_stsz(padd);
- if (ret < 0)
+ if (padd->decoder_length > 0) {
+ padd->consumed = 0;
+ if (!padd->offset_pos) {
+ ret = len;
+ if (find_stco(padd) < 0)
+ goto out;
+ }
+ if (padd->offset_pos < padd->noffsets) {
+ fill_offset_table(padd);
+ ret = padd->consumed;
goto out;
- }
- if (padd->table_pos < padd->nsamples) {
- fill_table(padd);
- ret = padd->consumed;
- goto out;
- }
-#endif
- if (!padd->offset_pos) {
-// ret = find_stco(padd);
-// if (ret < 0)
-// goto out;
+ }
+// PARA_INFO_LOG("consumed total: %lu, first_chunk: %d\n",
+// padd->consumed_total, padd->offset[0]);
ret = len;
- if (find_stco(padd) < 0)
+ if (padd->consumed_total + len < padd->offset[0])
goto out;
+ if (padd->consumed_total < padd->offset[0])
+ padd->consumed = padd->offset[0] - padd->consumed_total;
}
- if (padd->offset_pos < padd->noffsets) {
- fill_offset_table(padd);
- ret = padd->consumed;
- goto out;
- }
- PARA_INFO_LOG("consumed total: %lu, first_chunk: %d\n",
- padd->consumed_total, padd->offset[0]);
- ret = len;
- if (padd->consumed_total + len < padd->offset[0])
- goto out;
- if (padd->consumed_total < padd->offset[0])
- padd->consumed = padd->offset[0] - padd->consumed_total;
+ for (; padd->consumed < padd->inbuf_len; padd->consumed++)
+ if ((padd->inbuf[padd->consumed] & 0xfe) == 0x20)
+ break;
+ if (padd->consumed >= padd->inbuf_len)
+ goto success;
p = padd->inbuf + padd->consumed;
+// PARA_NOTICE_LOG("p[0]: %lx\n", (long unsigned) *p);
outbuffer = NeAACDecDecode(padd->decoder, &padd->frame_info, p,
len - padd->consumed);
- PARA_INFO_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
- padd->frame_info.error, padd->consumed_total,
- padd->consumed, padd->frame_info.bytesconsumed);
ret = -E_AAC_DECODE;
if (padd->frame_info.error != 0) {
+ PARA_ERROR_LOG("frame_error: %d, consumed: %lu + %d + %lu\n",
+ padd->frame_info.error, padd->consumed_total,
+ padd->consumed, padd->frame_info.bytesconsumed);
PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(
padd->frame_info.error));
- goto out;
+ padd->consumed++; /* catch 21 */
+ goto success;
}
padd->consumed += padd->frame_info.bytesconsumed;
ret = padd->consumed;
fn->buf[fn->loaded++] = s[i] & 0xff;
fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
}
+success:
ret = padd->consumed;
out:
if (ret > 0)
projects / paraslash.git / blobdiff