fade: cosmetic cleanups

[paraslash.git] / aac_common.c

diff --git a/aac_common.c b/aac_common.c
index 2dc979011be245850cef106167bd4fad611abe1e..90ad67b3074c7d2d18e3ad8efa20df6492466802 100644 (file)
--- a/aac_common.c
+++ b/aac_common.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
@@ -42,11 +42,11 @@ NeAACDecHandle aac_open(void)
        return h;
 };
 
-static int aac_read_decoder_length(unsigned char *buf, int *description_len)
+static unsigned long aac_read_decoder_length(unsigned char *buf, int *description_len)
 {
        uint8_t b;
        uint8_t numBytes = 0;
-       uint32_t length = 0;
+       unsigned long length = 0;
 
        do {
                b = buf[numBytes];
@@ -65,16 +65,19 @@ static int aac_read_decoder_length(unsigned char *buf, int *description_len)
  * \param buflen length of \a buf
  * \param skip Upon succesful return, this contains the offset in \a buf where
  * the decoder config starts.
+ * \param decoder_length result pointer that is filled in with the length of
+ * the decoder configuration on success.
  *
- * \return The length of the decoder configuration
+ * \return positive on success, negative on errors
  */
-ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
+int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
+               unsigned long *decoder_length)
 {
        size_t i;
 
        for (i = 0; i + 4 < buflen; i++) {
                unsigned char *p = buf + i;
-               int decoder_length, description_len;
+               int description_len;
 
                if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
                        continue;
@@ -96,11 +99,11 @@ ssize_t aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip)
                        continue;
                i++;
                p = buf + i;
-               decoder_length = aac_read_decoder_length(p, &description_len);
-               PARA_INFO_LOG("decoder length: %d\n", decoder_length);
+               *decoder_length = aac_read_decoder_length(p, &description_len);
+               PARA_INFO_LOG("decoder length: %lu\n", *decoder_length);
                i += description_len;
                *skip = i;
-               return decoder_length;
+               return 1;
        }
        return -E_ESDS;
 }