Merge branch 'master' into next

[paraslash.git] / aacdec.c

diff --git a/aacdec.c b/aacdec.c
index 89781c528d9f107a65d75cf120cd9eb412c47271..38f69e8811a79d9e40da8648c38eb4bae35233a2 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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,
@@ -53,7 +41,7 @@ struct private_aacdec_data {
         * 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 */
@@ -73,15 +61,15 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 
        if (fn->loaded > fn->bufsize * 3 / 5)
                return 0;
-       if (len < 2048 && !*fc->input_eof)
+       if (len < 2048 && !*fc->input_error)
                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);
@@ -91,6 +79,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;
@@ -167,9 +157,9 @@ out:
 
 static void aacdec_open(struct filter_node *fn)
 {
-       fn->private_data = para_calloc(sizeof(struct private_aacdec_data));
-       struct private_aacdec_data *padd = fn->private_data;
+       struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
+       fn->private_data = padd;
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
        padd->handle = aac_open();
@@ -193,7 +183,7 @@ static void aacdec_close(struct filter_node *fn)
  *
  * \sa filter::init
  */
-void aacdec_init(struct filter *f)
+void aacdec_filter_init(struct filter *f)
 {
        f->open = aacdec_open;
        f->convert = aacdec;