ortp_recv: Set remote address
[paraslash.git] / aacdec.c
index e07c146..edbe263 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
 #include "para.h"
 
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
 #include "aac.h"
 
-#define MAX_CHANNELS 6
 /** the output buffer size */
-#define AAC_OUTBUF_SIZE (FAAD_MIN_STREAMSIZE * MAX_CHANNELS)
+#define AAC_OUTBUF_SIZE (32 * 1024)
+
+#define MAX_ERRORS 20
 
 /**
  * data specific to the aacdec filter
@@ -45,6 +47,7 @@ struct private_aacdec_data {
 
        int initialized;
        int decoder_length;
+       unsigned error_count;
        size_t consumed_total;
        size_t entry;
 };
@@ -58,9 +61,9 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
        unsigned char *inbuf = (unsigned char*)input_buffer;
        size_t skip, consumed = 0;
 
-       if (fn->loaded > fn->bufsize * 4 / 5)
+       if (fn->loaded > fn->bufsize * 3 / 5)
                return 0;
-       if (len < 1000 && !*fc->eof)
+       if (len < 2048 && !*fc->input_eof)
                return 0;
 
        if (!padd->initialized) {
@@ -111,7 +114,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                if (padd->consumed_total < padd->entry)
                        consumed = padd->entry - padd->consumed_total;
        }
-       for (; consumed < len;consumed++)
+       for (; consumed < len; consumed++)
                if ((inbuf[consumed] & 0xfe) == 0x20)
                        break;
        if (consumed >= len)
@@ -119,8 +122,10 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
        p = inbuf + consumed;
        outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info, p,
                len - consumed);
-       ret = -E_AAC_DECODE;
-       if (padd->frame_info.error != 0) {
+       if (padd->frame_info.error) {
+               ret = -E_AAC_DECODE;
+               if (padd->error_count++ > MAX_ERRORS)
+                       goto out;
                PARA_ERROR_LOG("frame_error: %d, consumed: %zu + %zd + %lu\n",
                        padd->frame_info.error, padd->consumed_total,
                        consumed, padd->frame_info.bytesconsumed);
@@ -129,10 +134,14 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                consumed++; /* catch 21 */
                goto success;
        }
+       padd->error_count = 0;
        consumed += padd->frame_info.bytesconsumed;
        ret = consumed;
        if (!padd->frame_info.samples)
                goto out;
+       ret = -E_AAC_OVERRUN;
+       if (padd->frame_info.samples * 2 + fn->loaded > fn->bufsize)
+               goto out;
        for (i = 0; i < padd->frame_info.samples; i++) {
                short *s = (short *)outbuffer;
                fn->buf[fn->loaded++] = s[i] & 0xff;