/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/**
* call the convert function of each filter
*
+ * \param s unused
+ * \param t the task containing the filter chain
+ *
* This is the core function of the filter subsystem. It loops over the list of
* filter nodes determined by \a t and calls the filter's convert function if
* there is input available for the filter node in question. If the convert
t->ret = -E_FC_EOF;
if (fc->output_eof && *fc->output_eof)
goto err_out;
- if (fc->input_eof && *fc->input_eof && !*fc->in_loaded)
- goto err_out;
again:
ib = fc->inbuf;
loaded = fc->in_loaded;
conv = 0;
list_for_each_entry(fn, &fc->filters, node) {
if (*loaded && fn->loaded < fn->bufsize) {
- size_t old_fn_loaded = fn->loaded;
+ size_t size, old_fn_loaded = fn->loaded;
// PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
// fc, *loaded, fn->filter->name);
t->ret = fn->filter->convert(ib, *loaded, fn);
if (t->ret < 0)
goto err_out;
- call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+ size = t->ret;
+ call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
fn->loaded - old_fn_loaded);
- *loaded -= t->ret;
- conv += t->ret;
- if (*loaded && t->ret) {
+ *loaded -= size;
+ conv += size;
+ if (*loaded && size) {
// PARA_DEBUG_LOG("moving %zd bytes in input "
// "buffer for %s filter\n",
// *loaded, fn->filter->name);
- memmove(ib, ib + t->ret, *loaded);
+ memmove(ib, ib + size, *loaded);
}
}
ib = fn->buf;
argv[0] = para_strdup(f->name);
argc += 1;
*conf = f->parse_config(argc, argv);
+ free(argv[0]);
+ free(argv);
return *conf? filter_num : -E_BAD_FILTER_OPTIONS;
}