init_random_seed(): Use para_open() to open /dev/urandom.

[paraslash.git] / oggdec.c

diff --git a/oggdec.c b/oggdec.c
index 714d620e7adb06a414e5eba3a0d3fe55cef476b8..b82f12ef8b994c605cb7f1699e0923d41738d365 100644 (file)
--- a/oggdec.c
+++ b/oggdec.c
@@ -1,48 +1,38 @@
 /*
 /*

- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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 */
+/** \file oggdec.c Paraslash's ogg vorbis decoder. */

 
 #include "para.h"
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
 
 #include "para.h"
 
 #include "oggdec_filter.cmdline.h"
 #include "list.h"

+#include "sched.h"

 #include "filter.h"
 #include "error.h"
 #include "string.h"
 
 #include <vorbis/vorbisfile.h>
 
 #include "filter.h"
 #include "error.h"
 #include "string.h"
 
 #include <vorbis/vorbisfile.h>
 

-/** \cond some internal constants */
-#define BITS 16
+/** Determine byte sex. */
+#ifdef WORDS_BIGENDIAN
+#define ENDIAN 1
+#else

 #define ENDIAN 0
 #define ENDIAN 0

-#define SIGN 1
-/** \endcond */
+#endif

 
 

-/** data specific to the oggdec filter */
+/** Data specific to the oggdec filter. */

 struct private_oggdec_data {
 struct private_oggdec_data {

-       /** describes an ogg vorbis file */
+       /** Describes an ogg vorbis file. */

        OggVorbis_File *vf;
        OggVorbis_File *vf;

-       /** the input buffer */
+       /** The input buffer. */

        char *inbuf;
        char *inbuf;

-       /** the length of \a inbuf */
+       /** The length of \a inbuf. */

        size_t inbuf_len;
        size_t inbuf_len;

-       /** the number of bytes consumed from the input buffer */
+       /** The number of bytes consumed from the input buffer. */

        size_t converted;
 };
 
        size_t converted;
 };
 


@@ -53,32 +43,33 @@ 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->fci->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_error)
+                       return 0;

                errno = EAGAIN;
                errno = EAGAIN;

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

        }
        }

-       ret = MIN(nmemb, have / size) * size;
+       ret = PARA_MIN(nmemb, have / size) * size;

        memcpy(buf, p, ret);
        pod->converted += ret;
        return ret;
 }
 
 /*
        memcpy(buf, p, ret);
        pod->converted += ret;
        return ret;
 }
 
 /*

- * cb_seek -- custom data seeking function
+ * Custom data seeking function.
+ *

  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */
  * Since we want the data source to be treated as unseekable at all
  * times, the provided seek callback always returns -1 (failure).
  */

-static int cb_seek(__unused void *datasource, __unused ogg_int64_t offset,
-               __unused int whence)
+static int cb_seek(__a_unused void *datasource, __a_unused ogg_int64_t offset,
+               __a_unused int whence)

 {
        return -1;
 }
 
 {
        return -1;
 }
 

-static int cb_close(__unused void *datasource)
+static int cb_close(__a_unused void *datasource)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -88,8 +79,8 @@ static const ov_callbacks ovc = {
        .seek_func = cb_seek,
        .close_func = cb_close,
        /*
        .seek_func = cb_seek,
        .close_func = cb_close,
        /*

-        * The tell function need not be provided if
-        * the data IO abstraction is not seekable
+        * The tell function need not be provided if the data IO abstraction is
+        * not seekable

         */
        .tell_func = NULL
 };
         */
        .tell_func = NULL
 };


@@ -133,9 +124,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->fci->eof && !fn->fci->error) {
-                       PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
-                               len, ib);
+               if (len <ib && !*fn->fc->input_error) {
+                       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));


@@ -154,21 +145,21 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
                        return -E_OGGDEC_BADHEADER;
                if (ret < 0)
                        return -E_OGGDEC_FAULT;
                        return -E_OGGDEC_BADHEADER;
                if (ret < 0)
                        return -E_OGGDEC_FAULT;

-               fn->fci->channels = ov_info(pod->vf, 0)->channels;
-               fn->fci->samplerate = ov_info(pod->vf, 0)->rate;
-               PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fci->channels, fn->fci->samplerate);
+               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);

        }
        }

-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_error && fn->loaded < fn->bufsize) {
+               int length = fn->bufsize - fn->loaded;
+               long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length,
+                       ENDIAN, 2 /* 16 bit */, 1 /* signed */, 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->fci->eof && !fn->fci->error && fn->loaded < fn->bufsize)
-               goto again;

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


@@ -181,7 +172,11 @@ static void *oggdec_parse_config(int argc, char **argv)
        return NULL;
 }
 
        return NULL;
 }
 

-/** the init function of the ogg vorbis decoder */
+/**
+ * The init function of the ogg vorbis decoder.
+ *
+ * \param f Its fields are filled in by the function.
+ */

 void oggdec_init(struct filter *f)
 {
        f->open = ogg_open;
 void oggdec_init(struct filter *f)
 {
        f->open = ogg_open;