projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b333e04
)
aacdec: Switch to the alternative post select method.
author
Andre Noll
<maan@systemlinux.org>
Sun, 31 Mar 2013 13:08:46 +0000
(13:08 +0000)
committer
Andre Noll
<maan@systemlinux.org>
Tue, 30 Apr 2013 12:12:45 +0000
(14:12 +0200)
aacdec_filter.c
patch
|
blob
|
history
diff --git
a/aacdec_filter.c
b/aacdec_filter.c
index 55f7ea25fc43b32c9d1c5a28288b867e2151a028..9cea898035d77bea71c860a486e6bf609faeffbd 100644
(file)
--- a/
aacdec_filter.c
+++ b/
aacdec_filter.c
@@
-80,7
+80,7
@@
static void aacdec_close(struct filter_node *fn)
fn->private_data = NULL;
}
fn->private_data = NULL;
}
-static
void
aacdec_post_select(__a_unused struct sched *s, struct task *t)
+static
int
aacdec_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct btr_node *btrn = fn->btrn;
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct btr_node *btrn = fn->btrn;
@@
-91,12
+91,11
@@
static void aacdec_post_select(__a_unused struct sched *s, struct task *t)
size_t len, skip, consumed, loaded;
next_buffer:
size_t len, skip, consumed, loaded;
next_buffer:
- t->error = 0;
ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (ret < 0)
goto err;
if (ret == 0)
ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
if (ret < 0)
goto err;
if (ret == 0)
- return;
+ return
0
;
btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, (char **)&inbuf);
len = PARA_MIN(len, (size_t)8192);
btr_merge(btrn, fn->min_iqs);
len = btr_next_buffer(btrn, (char **)&inbuf);
len = PARA_MIN(len, (size_t)8192);
@@
-203,8
+202,8
@@
out:
}
err:
assert(ret < 0);
}
err:
assert(ret < 0);
- t->error = ret;
btr_remove_node(&fn->btrn);
btr_remove_node(&fn->btrn);
+ return ret;
}
/**
}
/**
@@
-219,6
+218,7
@@
void aacdec_filter_init(struct filter *f)
f->open = aacdec_open;
f->close = aacdec_close;
f->pre_select = generic_filter_pre_select;
f->open = aacdec_open;
f->close = aacdec_close;
f->pre_select = generic_filter_pre_select;
- f->post_select = aacdec_post_select;
+ f->new_post_select = aacdec_post_select;
+ f->post_select = NULL;
f->execute = aacdec_execute;
}
f->execute = aacdec_execute;
}