int conv, conv_total = 0;
t->ret = -E_FC_EOF;
- if (*fc->output_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;
list_for_each_entry(fn, &fc->filters, node) {
if (*loaded && fn->loaded < fn->bufsize) {
size_t old_fn_loaded = fn->loaded;
- PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
- fc, *loaded, fn->filter->name);
+// 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;
*loaded -= t->ret;
conv += t->ret;
if (*loaded && t->ret) {
- PARA_INFO_LOG("moving %zd bytes in input buffer for %s filter\n",
- *loaded, fn->filter->name);
+// PARA_DEBUG_LOG("moving %zd bytes in input "
+// "buffer for %s filter\n",
+// *loaded, fn->filter->name);
memmove(ib, ib + t->ret, *loaded);
}
}
loaded = &fn->loaded;
}
conv_total += conv;
- PARA_INFO_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
- *fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total);
+// PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %zd, "
+// "conv: %d, conv_total: %d\n", *fc->input_eof,
+// fc->output_eof? *fc->output_eof : -42,
+// fc->eof, *fc->out_loaded, conv, conv_total);
if (conv)
goto again;
t->ret = 1;