From 74a835c7c3b6f4f71fc1f4739f26757dffdf012a Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 3 Jan 2010 03:34:53 +0100 Subject: [PATCH] Introduce and use generic_filter_pre_select(). --- aacdec_filter.c | 19 +------------------ filter.h | 1 + filter_common.c | 15 +++++++++++++++ mp3dec_filter.c | 19 +------------------ oggdec_filter.c | 18 +----------------- wmadec_filter.c | 18 +----------------- 6 files changed, 20 insertions(+), 70 deletions(-) diff --git a/aacdec_filter.c b/aacdec_filter.c index 80e49a0e..cb27633c 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -58,22 +58,6 @@ struct private_aacdec_data { unsigned int samplerate; }; -#define AACDEC_MAX_PENDING (640 * 1024) - -static void aacdec_pre_select(struct sched *s, struct task *t) -{ - struct filter_node *fn = container_of(t, struct filter_node, task); - size_t iqs = btr_get_input_queue_size(fn->btrn); - - t->error = 0; - if (iqs == 0) - return; - if (btr_bytes_pending(fn->btrn) > AACDEC_MAX_PENDING) - return; /* FIXME, should use reasonable bound on timeout */ - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn) { struct private_aacdec_data *padd = fn->private_data; @@ -358,8 +342,7 @@ void aacdec_filter_init(struct filter *f) f->open = aacdec_open; f->convert = aacdec; f->close = aacdec_close; - f->pre_select = aacdec_pre_select; - f->post_select = aacdec_post_select; + f->pre_select = generic_filter_pre_select; f->post_select = aacdec_post_select; f->execute = aacdec_execute; } diff --git a/filter.h b/filter.h index 8b5e8bc9..b6901813 100644 --- a/filter.h +++ b/filter.h @@ -206,6 +206,7 @@ int check_filter_arg(char *filter_arg, void **conf); void filter_post_select(__a_unused struct sched *s, struct task *t); void print_filter_helps(int detailed); int prepare_filter_node(struct filter_node *fn); +void generic_filter_pre_select(struct sched *s, struct task *t); static inline void write_int16_host_endian(char *buf, int val) { diff --git a/filter_common.c b/filter_common.c index 988c3576..56fbd82b 100644 --- a/filter_common.c +++ b/filter_common.c @@ -296,3 +296,18 @@ int prepare_filter_node(struct filter_node *fn) btr_merge(btrn, fn->min_iqs); return 1; } + +void generic_filter_pre_select(struct sched *s, struct task *t) +{ + struct filter_node *fn = container_of(t, struct filter_node, task); + size_t iqs = btr_get_input_queue_size(fn->btrn); + + t->error = 0; + if (iqs <= fn->min_iqs) + return; + if (btr_bytes_pending(fn->btrn) > FILTER_MAX_PENDING) + return; /* FIXME, should use reasonable bound on timeout */ + s->timeout.tv_sec = 0; + s->timeout.tv_usec = 1; +} + diff --git a/mp3dec_filter.c b/mp3dec_filter.c index 7fe8562d..1e074a7e 100644 --- a/mp3dec_filter.c +++ b/mp3dec_filter.c @@ -94,23 +94,6 @@ static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len) return 1; } -/** 640K ought to be enough for everybody ;) */ -#define MP3DEC_MAX_PENDING (640 * 1024) - -static void mp3dec_pre_select(struct sched *s, struct task *t) -{ - struct filter_node *fn = container_of(t, struct filter_node, task); - size_t iqs = btr_get_input_queue_size(fn->btrn); - - t->error = 0; - if (iqs <= fn->min_iqs) - return; - if (btr_bytes_pending(fn->btrn) > MP3DEC_MAX_PENDING) - return; /* FIXME, should use reasonable bound on timeout */ - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn) { int i, ret; @@ -350,7 +333,7 @@ void mp3dec_filter_init(struct filter *f) f->convert = mp3dec; f->close = mp3dec_close; f->parse_config = mp3dec_parse_config; - f->pre_select = mp3dec_pre_select; + f->pre_select = generic_filter_pre_select; f->post_select = mp3dec_post_select; f->execute = mp3dec_execute; f->help = (struct ggo_help) { diff --git a/oggdec_filter.c b/oggdec_filter.c index 13472442..ccc42559 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -159,10 +159,8 @@ static void ogg_close(struct filter_node *fn) fn->private_data = NULL; } -#define OGGDEC_MAX_PENDING (640 * 1024) #define OGGDEC_OUTPUT_CHUNK_SIZE (64 * 1024) - static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result) { struct filter_node *fn = btr_context(btrn); @@ -183,20 +181,6 @@ static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result) return -ERRNO_TO_PARA_ERROR(ENOTSUP); } -static void ogg_pre_select(struct sched *s, struct task *t) -{ - struct filter_node *fn = container_of(t, struct filter_node, task); - size_t iqs = btr_get_input_queue_size(fn->btrn); - - t->error = 0; - if (iqs == 0) - return; - if (btr_bytes_pending(fn->btrn) > OGGDEC_MAX_PENDING) - return; /* FIXME, should use reasonable bound on timeout */ - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - static void ogg_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); @@ -390,7 +374,7 @@ void oggdec_filter_init(struct filter *f) f->open = ogg_open; f->close = ogg_close; f->convert = ogg_convert; - f->pre_select = ogg_pre_select; + f->pre_select = generic_filter_pre_select; f->post_select = ogg_post_select; f->parse_config = oggdec_parse_config; f->execute = oggdec_execute; diff --git a/wmadec_filter.c b/wmadec_filter.c index 803ef59f..214ceb1b 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -1225,22 +1225,6 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) return -ERRNO_TO_PARA_ERROR(ENOTSUP); } -#define WMADEC_MAX_PENDING (640 * 1024) - -static void wmadec_pre_select(struct sched *s, struct task *t) -{ - struct filter_node *fn = container_of(t, struct filter_node, task); - size_t iqs = btr_get_input_queue_size(fn->btrn); - - t->error = 0; - if (iqs == 0) - return; - if (btr_bytes_pending(fn->btrn) > WMADEC_MAX_PENDING) - return; /* FIXME, should use reasonable bound on timeout */ - s->timeout.tv_sec = 0; - s->timeout.tv_usec = 1; -} - #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024) static void wmadec_post_select(__a_unused struct sched *s, struct task *t) @@ -1357,6 +1341,6 @@ void wmadec_filter_init(struct filter *f) f->close = wmadec_close; f->convert = wmadec_convert; f->execute = wmadec_execute; - f->pre_select = wmadec_pre_select; + f->pre_select = generic_filter_pre_select; f->post_select = wmadec_post_select; } -- 2.39.2