Merge commit /fml/ag-raetsch/home/maan/tmp/paraslash_meins/paraslash/ of HEAD

[paraslash.git] / aac_common.c

diff --git a/aac_common.c b/aac_common.c
index 148fefc36ad96394c4aa35991ec0bd74fe5184e5..2dc979011be245850cef106167bd4fad611abe1e 100644 (file)
--- a/aac_common.c
+++ b/aac_common.c
@@ -1,7 +1,35 @@
+/*
+ * 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_common.c common functions of aac_afh and aadcec */
+
 #include "para.h"
 #include "aac.h"
 #include "error.h"
 
+/**
+ * get a new libfaad decoder handle
+ *
+ */
 NeAACDecHandle aac_open(void)
 {
        NeAACDecHandle h = NeAACDecOpen();
@@ -30,9 +58,19 @@ static int aac_read_decoder_length(unsigned char *buf, int *description_len)
        return length;
 }
 
-int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip)
+/**
+ * search for the position and the length of the decoder configuration
+ *
+ * \param buf buffer to seach
+ * \param buflen length of \a buf
+ * \param skip Upon succesful return, this contains the offset in \a buf where
+ * the decoder config starts.
+ *
+ * \return The length of the decoder configuration
+ */
+ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
 {
-       int i;
+       size_t i;
 
        for (i = 0; i + 4 < buflen; i++) {
                unsigned char *p = buf + i;
@@ -42,7 +80,7 @@ int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip)
                        continue;
                i += 8;
                p = buf + i;
-               PARA_INFO_LOG("found esds@%d, next: %x\n", i, *p);
+               PARA_INFO_LOG("found esds@%zu, next: %x\n", i, *p);
                if (*p == 3)
                        i += 8;
                else
@@ -67,31 +105,35 @@ int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip)
        return -E_ESDS;
 }
 
-unsigned aac_read_int32(unsigned char *buf)
+/**
+ * search for the first entry in the stco table
+ *
+ * \param buf buffer to seach
+ * \param buflen length of \a buf
+ * \param skip Upon succesful return, this contains the number
+ * of bytes to skip from the input buffer.
+ *
+ * \return the position of the first entry in the table on success,
+ * -E_STCO on errors.
+ */
+ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip)
 {
-       uint8_t *d = (uint8_t*)buf;
-       return (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3];
-}
-
-
-int aac_find_entry(unsigned char *buf, unsigned buflen, int *skip)
-{
-       int i, ret;
+       ssize_t ret;
+       size_t i;
 
        for (i = 0; i + 20 < buflen; i++) {
                unsigned char *p = buf + i;
 
                if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
                        continue;
-               PARA_INFO_LOG("found stco@%d\n", i);
+               PARA_INFO_LOG("found stco@%zu\n", i);
                i += 12;
                ret = aac_read_int32(buf + i); /* first offset */
                i += 4;
-               PARA_INFO_LOG("num entries: %d\n", ret);
+               PARA_INFO_LOG("entry point: %zd\n", ret);
                *skip = i;
                return ret;
        }
-       PARA_WARNING_LOG("stco not found, buflen: %d\n", buflen);
+       PARA_WARNING_LOG("stco not found, buflen: %zu\n", buflen);
        return -E_STCO;
 }
-