From a55083779b7029a251019b8ef4d053d6eb29220a Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 31 Mar 2013 13:28:48 +0000 Subject: [PATCH] oggdec: Switch to the alternative post select method. --- oggdec_filter.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/oggdec_filter.c b/oggdec_filter.c index b405f869..791be276 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -199,7 +199,7 @@ static void ogg_pre_select(struct sched *s, struct task *t) sched_min_delay(s); } -static void ogg_post_select(__a_unused struct sched *s, struct task *t) +static int ogg_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); struct private_oggdec_data *pod = fn->private_data; @@ -217,7 +217,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) } else if (ret == 0 && !pod->have_more) /* nothing to do */ goto out; if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) - return; + return 0; if (!pod->vf) { if (ret <= 0) goto out; @@ -254,12 +254,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) if (ret == OV_HOLE) /* avoid buffer underruns */ fn->min_iqs = 9000; if (ret >= 0 || ret == OV_HOLE) - return; + return 0; ret = -E_OGGDEC_BADLINK; out: - t->error = ret; if (ret < 0) btr_remove_node(&fn->btrn); + return ret; } /** @@ -272,6 +272,7 @@ 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->new_post_select = ogg_post_select; + f->post_select = NULL; f->execute = oggdec_execute; } -- 2.39.5