X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=opusdec_filter.c;h=10ed394d295072d909441fe211fbcdc695ff62d0;hp=c3b405cc338df6666342e863aa3a0ac053ea8500;hb=e8d5da94efd6cbb0aa75f57290c76d9992ff8f47;hpb=e6e3a404091110ac770f65dad64e194f5900cd27

diff --git a/opusdec_filter.c b/opusdec_filter.c
index c3b405cc..10ed394d 100644
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -2,9 +2,9 @@
  * Copyright (c) 2002-2007 Jean-Marc Valin
  * Copyright (c) 2008 CSIRO
  * Copyright (c) 2007-2012 Xiph.Org Foundation
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
  *
- * Licensed under the GPL v2. For licencing details see COPYING.
+ * Licensed under the GPL v2, see file COPYING.
  */
 
 /** \file opusdec_filter.c The ogg/opus decoder. */
@@ -50,7 +50,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -70,7 +69,7 @@ struct opusdec_context {
 	ogg_page ogg_page;
 	bool eos;
 	int channels;
-	int preskip;
+	uint16_t preskip;
 	bool have_opus_stream;
 	bool have_more;
 	ogg_int32_t opus_serialno;
@@ -142,9 +141,10 @@ static int opusdec_init(ogg_packet *op, struct opusdec_context *ctx)
 static void opusdec_add_output(short *pcm, int frames_available,
 		struct btr_node *btrn, struct opusdec_context *ctx)
 {
-	int tmp_skip, num_frames, bytes;
+	int num_frames, bytes;
+	uint16_t tmp_skip;
 
-	tmp_skip = PARA_MIN(ctx->preskip, frames_available);
+	tmp_skip = PARA_MIN((int)ctx->preskip, frames_available);
 	ctx->preskip -= tmp_skip;
 	num_frames = frames_available - tmp_skip;
 	if (num_frames <= 0)
@@ -207,9 +207,9 @@ static int decode_packet(struct opusdec_context *ctx, ogg_packet *op,
 
 #define OPUSDEC_MAX_OUTPUT_SIZE (1024 * 1024)
 
-static int opusdec_post_select(__a_unused struct sched *s, struct task *t)
+static int opusdec_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct opusdec_context *ctx = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
@@ -269,32 +269,24 @@ out:
 	return ret;
 }
 
-static void opusdec_pre_select(struct sched *s, struct task *t)
+static void opusdec_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct opusdec_context *ctx = fn->private_data;
 	int ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
 
 	if (ret != 0)
 		return sched_min_delay(s);
-	if (ctx->have_more)
+	if (!ctx->have_more)
 		return;
 	if (btr_get_output_queue_size(fn->btrn) <= OPUSDEC_MAX_OUTPUT_SIZE)
 		return sched_min_delay(s);
 }
 
-/**
- * The init function of the opusdec filter.
- *
- * \param f Pointer to the filter struct to initialize.
- *
- * \sa filter::init.
- */
-void opusdec_filter_init(struct filter *f)
-{
-	f->open = opusdec_open;
-	f->close = opusdec_close;
-	f->pre_select = opusdec_pre_select;
-	f->post_select = opusdec_post_select;
-	f->execute = opusdec_execute;
-}
+const struct filter lsg_filter_cmd_com_opusdec_user_data = {
+	.open = opusdec_open,
+	.close = opusdec_close,
+	.pre_select = opusdec_pre_select,
+	.post_select = opusdec_post_select,
+	.execute = opusdec_execute,
+};