ignore zero bit when checking for frame start

[paraslash.git] / aacdec.c

diff --git a/aacdec.c b/aacdec.c
index 3dbb99fdca6e83ff6cf1b0625c34b4c3e45f7f5a..0eab773a16a024a693d40728d41aa9ea87b8dd49 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -49,6 +49,7 @@ struct private_mp4dec_data {
        mp4AudioSpecificConfig mp4ASC;
 
        int initialized;
+       int decoder_length;
        unsigned char *inbuf;
        int inbuf_len;
        int consumed;
@@ -172,16 +173,22 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
        padd->inbuf_len = len;
 
        if (!padd->initialized) {
-               ret = find_esds(padd);
-               if (ret < 0)
-                       goto out;
-
-               p = padd->inbuf + 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;
@@ -189,35 +196,44 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
                        fci->channels);
                padd->initialized = 1;
        }
-       padd->consumed = 0;
-       if (!padd->offset_pos) {
+       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;
+               }
+//             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;
@@ -229,6 +245,7 @@ static ssize_t mp4dec(char *inbuffer, size_t len, struct filter_node *fn)
                fn->buf[fn->loaded++] = s[i] & 0xff;
                fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
        }
+success:
        ret = padd->consumed;
 out:
        if (ret > 0)