From 1cccaaa2bdba9f7f0dd6785058a88027016fdc27 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 24 Sep 2020 16:57:15 +0200 Subject: [PATCH] merger: we always consume all input Even when we only have empty input buffers --- spa/plugins/audioconvert/merger.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spa/plugins/audioconvert/merger.c b/spa/plugins/audioconvert/merger.c index 482f908ce..1431bdac3 100644 --- a/spa/plugins/audioconvert/merger.c +++ b/spa/plugins/audioconvert/merger.c @@ -1006,8 +1006,6 @@ static int impl_node_process(void *object) spa_log_trace_fp(this->log, NAME " %p: %d %d %d %p", this, sd->chunk->size, maxsize, n_samples, src_datas[i]); - - SPA_FLAG_SET(res, SPA_STATUS_NEED_DATA); } for (i = 0; i < this->monitor_count; i++) @@ -1026,7 +1024,7 @@ static int impl_node_process(void *object) if (!this->is_passthrough) convert_process(&this->conv, dst_datas, src_datas, n_samples); - return res | SPA_STATUS_HAVE_DATA; + return SPA_STATUS_NEED_DATA | SPA_STATUS_HAVE_DATA; } static const struct spa_node_methods impl_node = {