X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=708a27e52b68c1c2add01a3b3fe39f721485e39f;hp=8a3e261e122c2b92061bbe2bf73c44132884249a;hb=71386e2530fa351d22f942ce3cf9d18eee99ce78;hpb=093dda1824631372587d107d64601389027c6187

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 8a3e261e..708a27e5 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
 
@@ -12,7 +8,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -162,7 +157,7 @@ open:
 		goto out;
 	pod->channels = ov_info(vf, 0)->channels;
 	pod->sample_rate = ov_info(vf, 0)->rate;
-	PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
+	PARA_NOTICE_LOG("%u channels, %u Hz\n", pod->channels,
 		pod->sample_rate);
 	ret = 1;
 out:
@@ -178,7 +173,15 @@ out:
 	return ret;
 }
 
+/** Suspend decoding if output queue size is larger than that. */
 #define OGGDEC_MAX_OUTPUT_SIZE (96 * 1024)
+
+/**
+  * Allocate chunks of this size and produce at most one chunk of output per
+  * ->post_select() invocation. If the buffer could only be filled partially
+  * due to insufficient input being available, it is shrunk to the real output
+  * size and the resized buffer is fed into the output queue.
+  */
 #define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
 
 static void ogg_pre_select(struct sched *s, void *context)
@@ -256,16 +259,10 @@ out:
 	return ret;
 }
 
-/**
- * The init function of the ogg vorbis decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void oggdec_filter_init(struct filter *f)
-{
-	f->open = ogg_open;
-	f->close = ogg_close;
-	f->pre_select = ogg_pre_select;
-	f->post_select = ogg_post_select;
-	f->execute = oggdec_execute;
-}
+const struct filter lsg_filter_cmd_com_oggdec_user_data = {
+	.open = ogg_open,
+	.close = ogg_close,
+	.pre_select = ogg_pre_select,
+	.post_select = ogg_post_select,
+	.execute = oggdec_execute
+};