projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 't/test_man'
[paraslash.git]
/
oggdec_filter.c
diff --git
a/oggdec_filter.c
b/oggdec_filter.c
index c5c0b538cd739c6d7168d6125d5e5562e476cb9b..3222b4aaaaabc046ac3983359ae58d868861c46a 100644
(file)
--- a/
oggdec_filter.c
+++ b/
oggdec_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-201
2
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-201
4
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-136,14
+136,13
@@
open:
0, /* no initial bytes */
ovc); /* the ov_open_callbacks */
if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
0, /* no initial bytes */
ovc); /* the ov_open_callbacks */
if (oret == OV_ENOTVORBIS || oret == OV_EBADHEADER) {
- /*
this might be due to the input buffer being
too small */
+ /*
maybe the input buffer is
too small */
if (!btr_no_parent(btrn)) {
fn->min_iqs += 1000;
iqs = btr_get_input_queue_size(btrn);
ret = 0;
if (iqs < fn->min_iqs)
goto out;
if (!btr_no_parent(btrn)) {
fn->min_iqs += 1000;
iqs = btr_get_input_queue_size(btrn);
ret = 0;
if (iqs < fn->min_iqs)
goto out;
- PARA_CRIT_LOG("iqs: %zu\n", iqs);
btr_merge(btrn, fn->min_iqs);
pod->converted = 0;
goto open;
btr_merge(btrn, fn->min_iqs);
pod->converted = 0;
goto open;
@@
-199,7
+198,7
@@
static void ogg_pre_select(struct sched *s, struct task *t)
sched_min_delay(s);
}
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;
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct private_oggdec_data *pod = fn->private_data;
@@
-217,7
+216,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)
} 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;
if (!pod->vf) {
if (ret <= 0)
goto out;
@@
-236,13
+235,8
@@
static void ogg_post_select(__a_unused struct sched *s, struct task *t)
break;
fn->min_iqs = 0;
have += ret;
break;
fn->min_iqs = 0;
have += ret;
- if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
- continue;
- if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+ if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
break;
break;
- btr_add_output(buf, have, btrn);
- buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
- have = 0;
}
pod->have_more = (ret > 0);
if (have > 0) {
}
pod->have_more = (ret > 0);
if (have > 0) {
@@
-254,12
+248,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)
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:
ret = -E_OGGDEC_BADLINK;
out:
- t->error = ret;
if (ret < 0)
btr_remove_node(&fn->btrn);
if (ret < 0)
btr_remove_node(&fn->btrn);
+ return ret;
}
/**
}
/**