aac: add GPL headers to all files

and some other minor cleanups.

diff --git a/aac.h b/aac.h
index 015bff8c5516b746f13b637b1e5158ef664cc4de..0cfa0105bef6c83c3e5f537a8aad617ab07ebb39 100644 (file)
--- a/aac.h
+++ b/aac.h
@@ -1,7 +1,26 @@
+/*
+ * Copyright (C) 2006 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.
+ */
+
+/** \file aac.h exported symbols from aac_common.c */
+

 #include <neaacdec.h>
 
 #include <neaacdec.h>
 

-/* exported symbols from aac_common.c */

 NeAACDecHandle aac_open(void);
 int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip);
 NeAACDecHandle aac_open(void);
 int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip);

-int aac_find_entry(unsigned char *buf, unsigned buflen, int *skip);
+int aac_find_entry_point(unsigned char *buf, unsigned buflen, int *skip);

 unsigned aac_read_int32(unsigned char *buf);
 unsigned aac_read_int32(unsigned char *buf);

diff --git a/aac_afh.c b/aac_afh.c
index b7e828f4d7c76287e871fee87dc17023215a80ab..ac73fb193aae276df743d85db91e3808711b5fbd 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -15,8 +15,12 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */

-/** \file aac_afh.c para_server's aac audio format handler */
+/*
+ * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
+ * Ahead Software AG
+ */

 
 

+/** \file aac_afh.c para_server's aac audio format handler */

 
 #include "server.cmdline.h"
 #include "server.h"
 
 #include "server.cmdline.h"
 #include "server.h"


@@ -69,8 +73,7 @@ static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
        return -E_STCO;
 }
 
        return -E_STCO;
 }
 

-
-static int read_stsz(unsigned skip)
+static int read_chunk_table(unsigned skip)

 {
        int ret, i;
        long unsigned sum = 0;
 {
        int ret, i;
        long unsigned sum = 0;


@@ -109,7 +112,6 @@ static int read_stsz(unsigned skip)
 
 }
 
 
 }
 

-

 /*
  * Init m4a file and write some tech data to given pointers.
  */
 /*
  * Init m4a file and write some tech data to given pointers.
  */


@@ -151,12 +153,12 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
        } else
                PARA_WARNING_LOG("no mp4ASC %s\n", "");
 
        } else
                PARA_WARNING_LOG("no mp4ASC %s\n", "");
 

-       ret = read_stsz(skip);
+       ret = read_chunk_table(skip);

        if (ret < 0)
                return ret;
        *frames = num_chunks;
        for (;;) {
        if (ret < 0)
                return ret;
        *frames = num_chunks;
        for (;;) {

-               ret = aac_find_entry(inbuf, inbuf_len, &skip);
+               ret = aac_find_entry_point(inbuf, inbuf_len, &skip);

                if (ret >= 0)
                        break;
                ret = read(fileno(infile), inbuf, inbuf_size);
                if (ret >= 0)
                        break;
                ret = read(fileno(infile), inbuf, inbuf_size);

diff --git a/aac_common.c b/aac_common.c
index 148fefc36ad96394c4aa35991ec0bd74fe5184e5..b3463b25284f62bc2cffbe74c501755864965e38 100644 (file)
--- a/aac_common.c
+++ b/aac_common.c
@@ -1,3 +1,27 @@
+/*
+ * Copyright (C) 2006 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.
+ */
+/*
+ * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
+ * Ahead Software AG
+ */
+
+/** \file aac_ccomon.c common functions of aac_afh and aadcec */
+

 #include "para.h"
 #include "aac.h"
 #include "error.h"
 #include "para.h"
 #include "aac.h"
 #include "error.h"


@@ -74,7 +98,7 @@ unsigned aac_read_int32(unsigned char *buf)
 }
 
 
 }
 
 

-int aac_find_entry(unsigned char *buf, unsigned buflen, int *skip)
+int aac_find_entry_point(unsigned char *buf, unsigned buflen, int *skip)

 {
        int i, ret;
 
 {
        int i, ret;
 

diff --git a/aacdec.c b/aacdec.c
index 54b422986d585e710531bd94726858a60a293e87..ce9c50da84efcd47b2c325743f5d1feb58d9b376 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -15,7 +15,6 @@
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
  *     along with this program; if not, write to the Free Software
  *     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
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
  * Ahead Software AG


@@ -96,8 +95,8 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
        if (padd->decoder_length > 0) {
                consumed = 0;
                if (!padd->entry) {
        if (padd->decoder_length > 0) {
                consumed = 0;
                if (!padd->entry) {

-                       ret = aac_find_entry(inbuf + consumed, len - consumed,
-                               &skip);
+                       ret = aac_find_entry_point(inbuf + consumed,
+                               len - consumed, &skip);

                        if (ret < 0) {
                                ret = len;
                                goto out;
                        if (ret < 0) {
                                ret = len;
                                goto out;