NEWS update.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index e1c4517ec94e3cda5e5ba92d86485ec47666aef6..54586b581da2b061bde62cf7a55e60a8deaffea6 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-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
- *     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.
  */
 
 /** \file oggdec.c paraslash's ogg vorbis decoder */
@@ -31,7 +19,11 @@
 
 /** \cond some internal constants */
 #define BITS 16
+#ifdef WORDS_BIGENDIAN
+#define ENDIAN 1
+#else
 #define ENDIAN 0
+#endif
 #define SIGN 1
 /** \endcond */
 
@@ -60,7 +52,7 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
                if (*fn->fc->input_eof)
                        return 0;
                errno = EAGAIN;
-               return -1;
+               return (size_t)-1;
        }
        ret = PARA_MIN(nmemb, have / size) * size;
        memcpy(buf, p, ret);
@@ -135,8 +127,8 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
        if (!pod->vf) {
                int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
                if (len <ib && !*fn->fc->input_eof) {
-                       PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
-                               len, ib);
+                       PARA_DEBUG_LOG("initial input buffer %zd/%d, "
+                               "waiting for more data\n", len, ib);
                        return 0;
                }
                pod->vf = para_malloc(sizeof(struct OggVorbis_File));
@@ -157,19 +149,19 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
                        return -E_OGGDEC_FAULT;
                fn->fc->channels = ov_info(pod->vf, 0)->channels;
                fn->fc->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels, fn->fc->samplerate);
+               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels,
+                       fn->fc->samplerate);
        }
-again:
-       ret = ov_read(pod->vf, fn->buf + fn->loaded, fn->bufsize - fn->loaded,
-               ENDIAN, BITS / 8, SIGN, NULL);
-       if (ret == OV_HOLE || !ret) {
-               return pod->converted;
+       while (!*fn->fc->input_eof && fn->loaded < fn->bufsize) {
+               int length = fn->bufsize - fn->loaded;
+               long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
+                       ENDIAN, BITS / 8, SIGN, NULL);
+               if (read_ret == OV_HOLE || !read_ret)
+                       return pod->converted;
+               if (read_ret < 0)
+                       return -E_OGGDEC_BADLINK;
+               fn->loaded += read_ret;
        }
-       if (ret < 0)
-               return -E_OGGDEC_BADLINK;
-       fn->loaded += ret;
-       if (!*fn->fc->input_eof && fn->loaded < fn->bufsize)
-               goto again;
        return pod->converted;
 }