fade: cosmetic cleanups
[paraslash.git] / aacdec.c
index e07c146..79c437d 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * 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
 #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)
+
+/** give up decoding after that many errors */
+#define MAX_ERRORS 20
 
 /**
  * data specific to the aacdec filter
  * \sa filter, filter_node
  */
 struct private_aacdec_data {
+       /** the return value of aac_open */
        NeAACDecHandle handle;
+       /** info about the currently decoded frame */
        NeAACDecFrameInfo frame_info;
-
+       /** whether this instance of the aac decoder is already initialized */
        int initialized;
-       int decoder_length;
+       /**
+        * return value of aac_find_esds(). Used to call the right aacdec
+        * init function
+        */
+       unsigned long decoder_length;
+       /** number of times the decoder returned an error */
+       unsigned error_count;
+       /** number of bytes already consumed from the imput stream */
        size_t consumed_total;
+       /** return value of aac_find_entry_point */
        size_t entry;
 };
 
@@ -58,17 +71,17 @@ 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) {
                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);
@@ -78,6 +91,8 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                        }
                        consumed = ret;
                } else {
+                       PARA_INFO_LOG("decoder len: %lu\n",
+                               padd->decoder_length);
                        consumed += skip;
                        p = inbuf + consumed;
                        ret = -E_AACDEC_INIT;
@@ -111,7 +126,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 +134,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,14 +146,18 @@ 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;
-               fn->buf[fn->loaded++] = (s[i] >> 8) & 0xff;
+               write_int16_host_endian(fn->buf + fn->loaded, s[i]);
+               fn->loaded += 2;
        }
 success:
        ret = consumed;
@@ -170,6 +191,8 @@ static void aacdec_close(struct filter_node *fn)
 /**
  * the init function of the aacdec filter
  *
+ * \param f pointer to the filter struct to initialize
+ *
  * \sa filter::init
  */
 void aacdec_init(struct filter *f)