allow variable arguments in LOG functions to be omitted or empty.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index 637fa965b3d49d3dd35966791f2b882903b570ac..1cd1f02853e2a1fec99c66de57514f18d680c959 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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
  *
  *     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


@@ -22,6 +22,7 @@
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"

+#include "sched.h"

 #include "filter.h"
 #include "error.h"
 #include "string.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"


@@ -30,7 +31,11 @@
 
 /** \cond some internal constants */
 #define BITS 16
 
 /** \cond some internal constants */
 #define BITS 16

+#ifdef WORDS_BIGENDIAN
+#define ENDIAN 1
+#else

 #define ENDIAN 0
 #define ENDIAN 0

+#endif

 #define SIGN 1
 /** \endcond */
 
 #define SIGN 1
 /** \endcond */
 


@@ -53,13 +58,13 @@ static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
        size_t ret, have = pod->inbuf_len - pod->converted;
        char *p = pod->inbuf + pod->converted;
 
        size_t ret, have = pod->inbuf_len - pod->converted;
        char *p = pod->inbuf + pod->converted;
 

-       if (*fn->fc->eof)
-               return 0;

 //     PARA_DEBUG_LOG("pod = %p\n", pod);
 //     PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
        if (pod->inbuf_len < size) {
 //     PARA_DEBUG_LOG("pod = %p\n", pod);
 //     PARA_DEBUG_LOG("vorbis requests %d bytes, have %d\n", size * nmemb, have);
        if (pod->inbuf_len < size) {

+               if (*fn->fc->input_eof)
+                       return 0;

                errno = EAGAIN;
                errno = EAGAIN;

-               return -1;
+               return (size_t)-1;

        }
        ret = PARA_MIN(nmemb, have / size) * size;
        memcpy(buf, p, ret);
        }
        ret = PARA_MIN(nmemb, have / size) * size;
        memcpy(buf, p, ret);


@@ -133,9 +138,9 @@ 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 (!pod->vf) {
                int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */

-               if (len <ib && !*fn->fc->eof && !fn->fc->error) {
-                       PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
-                               len, ib);
+               if (len <ib && !*fn->fc->input_eof) {
+                       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));
                        return 0;
                }
                pod->vf = para_malloc(sizeof(struct OggVorbis_File));


@@ -156,19 +161,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;
                        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->eof && !fn->fc->error && fn->loaded < fn->bufsize)
-               goto again;

        return pod->converted;
 }
 
        return pod->converted;
 }